fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/3.6.5 (pull request #7944)

Browse Source 
PMCORE-3046: update with release 3.6.5

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Paula Quispe
2021-06-15 14:18:43 +00:00
committed by Julio Cesar Laura Avendaño
parent 5746135164 3312022746
commit 802970c82e
12 changed files with 102 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
resources/assets/js/api/Api.js
View File

@@ -109,6 +109,7 @@ export default {
credentials = window.config.SYS_CREDENTIALS, credentials = window.config.SYS_CREDENTIALS,
workspace = window.config.SYS_WORKSPACE, workspace = window.config.SYS_WORKSPACE,
server = window.config.SYS_SERVER_API, server = window.config.SYS_SERVER_API,
lang = window.config.SYS_LANG,
method = options.method || "get"; method = options.method || "get";
url = this.getUrl(_.extend(keys, credentials, { server }, { workspace }), service); url = this.getUrl(_.extend(keys, credentials, { server }, { workspace }), service);
@@ -119,7 +120,8 @@ export default {
headers: { headers: {
"Accept": "application/json", "Accept": "application/json",
"Content-Type": "application/json", "Content-Type": "application/json",
"Authorization": `Bearer ` + credentials.accessToken "Authorization": `Bearer ` + credentials.accessToken,
"Accept-Language": lang
} }
}); });
}, },
@@ -130,6 +132,7 @@ export default {
url, url,
credentials = window.config.SYS_CREDENTIALS, credentials = window.config.SYS_CREDENTIALS,
workspace = window.config.SYS_WORKSPACE, workspace = window.config.SYS_WORKSPACE,
lang = window.config.SYS_LANG,
server = window.config.SYS_SERVER_API; server = window.config.SYS_SERVER_API;
url = this.getUrl(_.extend(keys, credentials, { server }, { workspace }), service); url = this.getUrl(_.extend(keys, credentials, { server }, { workspace }), service);
@@ -140,7 +143,8 @@ export default {
headers: { headers: {
"Accept": "application/json", "Accept": "application/json",
"Content-Type": "application/json", "Content-Type": "application/json",
"Authorization": `Bearer ` + credentials.accessToken "Authorization": `Bearer ` + credentials.accessToken,
"Accept-Language": lang
} }
}); });
}, },
@@ -152,6 +156,7 @@ export default {
url, url,
credentials = window.config.SYS_CREDENTIALS, credentials = window.config.SYS_CREDENTIALS,
workspace = window.config.SYS_WORKSPACE, workspace = window.config.SYS_WORKSPACE,
lang = window.config.SYS_LANG,
server = window.config.SYS_SERVER_API; server = window.config.SYS_SERVER_API;
url = this.getUrl(_.extend(keys, credentials, { server }, { workspace }), service); url = this.getUrl(_.extend(keys, credentials, { server }, { workspace }), service);
@@ -163,7 +168,8 @@ export default {
headers: { headers: {
"Accept": "application/json", "Accept": "application/json",
"Content-Type": "application/json", "Content-Type": "application/json",
"Authorization": `Bearer ` + credentials.accessToken "Authorization": `Bearer ` + credentials.accessToken,
"Accept-Language": lang
} }
}); });
}, },
@@ -175,6 +181,7 @@ export default {
url, url,
credentials = window.config.SYS_CREDENTIALS, credentials = window.config.SYS_CREDENTIALS,
workspace = window.config.SYS_WORKSPACE, workspace = window.config.SYS_WORKSPACE,
lang = window.config.SYS_LANG,
server = window.config.SYS_SERVER_API; server = window.config.SYS_SERVER_API;
url = this.getUrl(_.extend(keys, credentials, { server }, { workspace }), service); url = this.getUrl(_.extend(keys, credentials, { server }, { workspace }), service);
@@ -184,7 +191,8 @@ export default {
headers: { headers: {
"Accept": "application/json", "Accept": "application/json",
"Content-Type": "application/json", "Content-Type": "application/json",
"Authorization": `Bearer ` + credentials.accessToken "Authorization": `Bearer ` + credentials.accessToken,
"Accept-Language": lang
} }
}); });
}, },
@@ -197,6 +205,7 @@ export default {
url, url,
credentials = window.config.SYS_CREDENTIALS, credentials = window.config.SYS_CREDENTIALS,
workspace = window.config.SYS_WORKSPACE, workspace = window.config.SYS_WORKSPACE,
lang = window.config.SYS_LANG,
server = window.config.SYS_SERVER_API; server = window.config.SYS_SERVER_API;
url = this.getUrl(_.extend(keys, credentials, { server }, { workspace }), service); url = this.getUrl(_.extend(keys, credentials, { server }, { workspace }), service);
@@ -208,7 +217,8 @@ export default {
headers: { headers: {
"Accept": "application/json", "Accept": "application/json",
"Content-Type": "application/json", "Content-Type": "application/json",
"Authorization": `Bearer ` + credentials.accessToken "Authorization": `Bearer ` + credentials.accessToken,
"Accept-Language": lang
} }
}); });
} }

6
resources/assets/js/api/Cases.js
View File

@@ -107,7 +107,8 @@ export let cases = {
window.config.SYS_WORKSPACE + window.config.SYS_WORKSPACE +
'/home/' + data.APP_NUMBER + '/pending-tasks', { '/home/' + data.APP_NUMBER + '/pending-tasks', {
headers: { headers: {
'Authorization': 'Bearer ' + window.config.SYS_CREDENTIALS.accessToken 'Authorization': 'Bearer ' + window.config.SYS_CREDENTIALS.accessToken,
"Accept-Language": window.config.SYS_LANG
} }
}); });
}, },
@@ -238,7 +239,8 @@ export let casesHeader = {
window.config.SYS_WORKSPACE + window.config.SYS_WORKSPACE +
'/home/counters', { '/home/counters', {
headers: { headers: {
'Authorization': 'Bearer ' + window.config.SYS_CREDENTIALS.accessToken 'Authorization': 'Bearer ' + window.config.SYS_CREDENTIALS.accessToken,
"Accept-Language": window.config.SYS_LANG
} }
}); });
} }

6
resources/assets/js/api/Menu.js
View File

@@ -8,7 +8,8 @@ export let menu = {
window.config.SYS_WORKSPACE + window.config.SYS_WORKSPACE +
'/home/menu', { '/home/menu', {
headers: { headers: {
'Authorization': 'Bearer ' + window.config.SYS_CREDENTIALS.accessToken 'Authorization': 'Bearer ' + window.config.SYS_CREDENTIALS.accessToken,
"Accept-Language": window.config.SYS_LANG
} }
}); });
@@ -20,7 +21,8 @@ export let menu = {
window.config.SYS_WORKSPACE + window.config.SYS_WORKSPACE +
'/home/tasks/counter', { '/home/tasks/counter', {
headers: { headers: {
'Authorization': 'Bearer ' + window.config.SYS_CREDENTIALS.accessToken 'Authorization': 'Bearer ' + window.config.SYS_CREDENTIALS.accessToken,
"Accept-Language": window.config.SYS_LANG
} }
}); });
} }

11
resources/assets/js/home/AdvancedSearch.vue
View File

@@ -115,7 +115,7 @@ export default {
filterHeader: "STARTED_BY_ME", filterHeader: "STARTED_BY_ME",
headers: [], headers: [],
newCase: { newCase: {
title: "New Case", title: this.$i18n.t("ID_NEW_CASE"),
class: "btn-success", class: "btn-success",
onClick: () => { onClick: () => {
this.$refs["newRequest"].show(); this.$refs["newRequest"].show();
@@ -149,6 +149,15 @@ export default {
duration: this.$i18n.t("ID_DURATION"), duration: this.$i18n.t("ID_DURATION"),
actions: "", actions: "",
}, },
texts: {
count:this.$i18n.t("ID_SHOWING_FROM_RECORDS_COUNT"),
first: this.$i18n.t("ID_FIRST"),
last: this.$i18n.t("ID_LAST"),
filter: this.$i18n.t("ID_FILTER") + ":",
limit: this.$i18n.t("ID_RECORDS") + ":",
page: this.$i18n.t("ID_PAGE") + ":",
noResults: this.$i18n.t("ID_NO_MATCHING_RECORDS")
},
selectable: { selectable: {
mode: "single", mode: "single",
only: function(row) { only: function(row) {

9
resources/assets/js/home/CaseDetail.vue
View File

@@ -169,6 +169,15 @@ export default {
due_date: this.$i18n.t("ID_DUE_DATE"), due_date: this.$i18n.t("ID_DUE_DATE"),
actions: this.$i18n.t("ID_ACTIONS") actions: this.$i18n.t("ID_ACTIONS")
}, },
texts: {
count:this.$i18n.t("ID_SHOWING_FROM_RECORDS_COUNT"),
first: this.$i18n.t("ID_FIRST"),
last: this.$i18n.t("ID_LAST"),
filter: this.$i18n.t("ID_FILTER") + ":",
limit: this.$i18n.t("ID_RECORDS") + ":",
page: this.$i18n.t("ID_PAGE") + ":",
noResults: this.$i18n.t("ID_NO_MATCHING_RECORDS")
},
selectable: { selectable: {
mode: "single", // or 'multiple' mode: "single", // or 'multiple'
only: function (row) { only: function (row) {

14
resources/assets/js/home/Draft.vue
View File

@@ -64,7 +64,7 @@ export default {
data() { data() {
return { return {
newCase: { newCase: {
title: "New Case", title: this.$i18n.t("ID_NEW_CASE"),
class: "btn-success", class: "btn-success",
onClick: () => { onClick: () => {
this.$refs["newRequest"].show(); this.$refs["newRequest"].show();
@@ -83,6 +83,7 @@ export default {
options: { options: {
filterable: false, filterable: false,
headings: { headings: {
detail: "",
case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_number: this.$i18n.t("ID_MYCASE_NUMBER"),
case_title: this.$i18n.t("ID_CASE_TITLE"), case_title: this.$i18n.t("ID_CASE_TITLE"),
process_name: this.$i18n.t("ID_PROCESS_NAME"), process_name: this.$i18n.t("ID_PROCESS_NAME"),
@@ -100,9 +101,18 @@ export default {
requestFunction(data) { requestFunction(data) {
return this.$parent.$parent.getCasesForVueTable(data); return this.$parent.$parent.getCasesForVueTable(data);
}, },
texts: {
count:this.$i18n.t("ID_SHOWING_FROM_RECORDS_COUNT"),
first: this.$i18n.t("ID_FIRST"),
last: this.$i18n.t("ID_LAST"),
filter: this.$i18n.t("ID_FILTER") + ":",
limit: this.$i18n.t("ID_RECORDS") + ":",
page: this.$i18n.t("ID_PAGE") + ":",
noResults: this.$i18n.t("ID_NO_MATCHING_RECORDS")
}
}, },
pmDateFormat: "Y-m-d H:i:s", pmDateFormat: "Y-m-d H:i:s",
clickCount: 0, clickCount: 0,
singleClickTimer: null, singleClickTimer: null,
statusTitle: { statusTitle: {
"ON_TIME": this.$i18n.t("ID_IN_PROGRESS"), "ON_TIME": this.$i18n.t("ID_IN_PROGRESS"),

11
resources/assets/js/home/MyCases.vue
View File

@@ -99,7 +99,7 @@ export default {
filterHeader: "STARTED", filterHeader: "STARTED",
headers: [], headers: [],
newCase: { newCase: {
title: "New Case", title: this.$i18n.t("ID_NEW_CASE"),
class: "btn-success", class: "btn-success",
onClick: () => { onClick: () => {
this.$refs["newRequest"].show(); this.$refs["newRequest"].show();
@@ -130,6 +130,15 @@ export default {
duration: this.$i18n.t("ID_DURATION"), duration: this.$i18n.t("ID_DURATION"),
actions: "", actions: "",
}, },
texts: {
count:this.$i18n.t("ID_SHOWING_FROM_RECORDS_COUNT"),
first: this.$i18n.t("ID_FIRST"),
last: this.$i18n.t("ID_LAST"),
filter: this.$i18n.t("ID_FILTER") + ":",
limit: this.$i18n.t("ID_RECORDS") + ":",
page: this.$i18n.t("ID_PAGE") + ":",
noResults: this.$i18n.t("ID_NO_MATCHING_RECORDS")
},
selectable: { selectable: {
mode: "single", mode: "single",
only: function(row) { only: function(row) {

11
resources/assets/js/home/Paused.vue
View File

@@ -80,7 +80,7 @@ export default {
data() { data() {
return { return {
newCase: { newCase: {
title: "New Case", title: this.$i18n.t("ID_NEW_CASE"),
class: "btn-success", class: "btn-success",
onClick: () => { onClick: () => {
this.$refs["newRequest"].show(); this.$refs["newRequest"].show();
@@ -112,6 +112,15 @@ export default {
actions: "", actions: "",
detail: "", detail: "",
}, },
texts: {
count:this.$i18n.t("ID_SHOWING_FROM_RECORDS_COUNT"),
first: this.$i18n.t("ID_FIRST"),
last: this.$i18n.t("ID_LAST"),
filter: this.$i18n.t("ID_FILTER") + ":",
limit: this.$i18n.t("ID_RECORDS") + ":",
page: this.$i18n.t("ID_PAGE") + ":",
noResults: this.$i18n.t("ID_NO_MATCHING_RECORDS")
},
selectable: { selectable: {
mode: "single", mode: "single",
only: function (row) { only: function (row) {

12
resources/assets/js/home/Todo.vue
View File

@@ -74,7 +74,7 @@ export default {
data() { data() {
return { return {
newCase: { newCase: {
title: "New Case", title: this.$i18n.t("ID_NEW_CASE"),
class: "btn-success", class: "btn-success",
onClick: () => { onClick: () => {
this.$refs["newRequest"].show(); this.$refs["newRequest"].show();
@@ -95,6 +95,7 @@ export default {
options: { options: {
filterable: false, filterable: false,
headings: { headings: {
detail: "",
case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_number: this.$i18n.t("ID_MYCASE_NUMBER"),
case_title: this.$i18n.t("ID_CASE_TITLE"), case_title: this.$i18n.t("ID_CASE_TITLE"),
process_name: this.$i18n.t("ID_PROCESS_NAME"), process_name: this.$i18n.t("ID_PROCESS_NAME"),
@@ -105,6 +106,15 @@ export default {
priority: this.$i18n.t("ID_PRIORITY"), priority: this.$i18n.t("ID_PRIORITY"),
actions: "", actions: "",
}, },
texts: {
count:this.$i18n.t("ID_SHOWING_FROM_RECORDS_COUNT"),
first: this.$i18n.t("ID_FIRST"),
last: this.$i18n.t("ID_LAST"),
filter: this.$i18n.t("ID_FILTER") + ":",
limit: this.$i18n.t("ID_RECORDS") + ":",
page: this.$i18n.t("ID_PAGE") + ":",
noResults: this.$i18n.t("ID_NO_MATCHING_RECORDS")
},
selectable: { selectable: {
mode: "single", mode: "single",
only: function (row) { only: function (row) {

11
resources/assets/js/home/Unassigned.vue
View File

@@ -74,7 +74,7 @@ export default {
data() { data() {
return { return {
newCase: { newCase: {
title: "New Case", title: this.$i18n.t("ID_NEW_CASE"),
class: "btn-success", class: "btn-success",
onClick: () => { onClick: () => {
this.$refs["newRequest"].show(); this.$refs["newRequest"].show();
@@ -107,6 +107,15 @@ export default {
actions: "", actions: "",
detail: "", detail: "",
}, },
texts: {
count:this.$i18n.t("ID_SHOWING_FROM_RECORDS_COUNT"),
first: this.$i18n.t("ID_FIRST"),
last: this.$i18n.t("ID_LAST"),
filter: this.$i18n.t("ID_FILTER") + ":",
limit: this.$i18n.t("ID_RECORDS") + ":",
page: this.$i18n.t("ID_PAGE") + ":",
noResults: this.$i18n.t("ID_NO_MATCHING_RECORDS")
},
selectable: { selectable: {
mode: "single", mode: "single",
only: function (row) { only: function (row) {

6
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -24077,6 +24077,12 @@ msgstr "Saving"
msgid "Saving process" msgid "Saving process"
msgstr "Saving process" msgstr "Saving process"
# TRANSLATION
# LABEL/ID_SCHEDULE_TIME
#: LABEL/ID_SCHEDULE_TIME
msgid "New cases scheduler"
msgstr "New cases scheduler"
# TRANSLATION # TRANSLATION
# LABEL/ID_SCHEDULER_LIST # LABEL/ID_SCHEDULER_LIST
#: LABEL/ID_SCHEDULER_LIST #: LABEL/ID_SCHEDULER_LIST

1
workflow/engine/data/mysql/insert.sql
View File

@@ -60925,6 +60925,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_SAVING_ENVIRONMENT_SETTINGS','en','Saving Environment Settings','2014-01-15') , ( 'LABEL','ID_SAVING_ENVIRONMENT_SETTINGS','en','Saving Environment Settings','2014-01-15') ,
( 'LABEL','ID_SAVING_LABEL','en','Saving','2014-01-15') , ( 'LABEL','ID_SAVING_LABEL','en','Saving','2014-01-15') ,
( 'LABEL','ID_SAVING_PROCESS','en','Saving process','2014-01-15') , ( 'LABEL','ID_SAVING_PROCESS','en','Saving process','2014-01-15') ,
( 'LABEL','ID_SCHEDULE_TIME','en','Schedule time','2021-05-02') ,
( 'LABEL','ID_SCHEDULER_LIST','en','New cases scheduler','2014-01-15') , ( 'LABEL','ID_SCHEDULER_LIST','en','New cases scheduler','2014-01-15') ,
( 'LABEL','ID_SCHEDULER_LOG','en','Cases Scheduler Logs','2014-01-15') , ( 'LABEL','ID_SCHEDULER_LOG','en','Cases Scheduler Logs','2014-01-15') ,
( 'LABEL','ID_SCHEDULER_SUCCESS_CHANGE_STATUS','en','Case Scheduler status has been changed correctly.','2014-01-15') , ( 'LABEL','ID_SCHEDULER_SUCCESS_CHANGE_STATUS','en','Case Scheduler status has been changed correctly.','2014-01-15') ,