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

Merged in bugfix/PMCORE-3385 (pull request #8188)

Browse Source 
PMCORE-3385

Approved-by: Rodrigo Quelca
This commit is contained in:
Fabio Guachalla
2021-09-29 20:47:20 +00:00
committed by Julio Cesar Laura Avendaño
parent 53d565be81 21ffc6fe32
commit 9fe8052e3e
7 changed files with 35 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/assets/js/components/search/AdvancedFilter.vue
View File

@@ -241,9 +241,9 @@ export default {
{
type: "CaseTitle",
id: "caseTitle",
title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_TASK_THREAD_TITLE')}`,
optionLabel: this.$i18n.t('ID_BY_TASK_THREAD_TITLE'),
tagPrefix: this.$i18n.t('ID_SEARCH_BY_TASK_THREAD_TITLE'),
title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_CASE_THREAD_TITLE')}`,
optionLabel: this.$i18n.t('ID_BY_CASE_THREAD_TITLE'),
tagPrefix: this.$i18n.t('ID_SEARCH_BY_CASE_THREAD_TITLE'),
detail: "",
tagText: "",
items:[

6
resources/assets/js/components/search/CasesFilter.vue
View File

@@ -132,10 +132,10 @@ export default {
type: "CaseTitle",
id: "caseTitle",
title: `${this.$i18n.t("ID_FILTER")}: ${this.$i18n.t(
"ID_BY_TASK_THREAD_TITLE"
"ID_BY_CASE_THREAD_TITLE"
)}`,
optionLabel: this.$i18n.t("ID_BY_TASK_THREAD_TITLE"),
tagPrefix: this.$i18n.t("ID_SEARCH_BY_TASK_THREAD_TITLE"),
optionLabel: this.$i18n.t("ID_BY_CASE_THREAD_TITLE"),
tagPrefix: this.$i18n.t("ID_SEARCH_BY_CASE_THREAD_TITLE"),
detail: "",
tagText: "",
items: [

6
resources/assets/js/components/search/MyCasesFilter.vue
View File

@@ -125,9 +125,9 @@ export default {
{
type: "CaseTitle",
id: "caseTitle",
title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_TASK_THREAD_TITLE')}`,
optionLabel: this.$i18n.t('ID_BY_TASK_THREAD_TITLE'),
tagPrefix: this.$i18n.t('ID_SEARCH_BY_TASK_THREAD_TITLE'),
title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_CASE_THREAD_TITLE')}`,
optionLabel: this.$i18n.t('ID_BY_CASE_THREAD_TITLE'),
tagPrefix: this.$i18n.t('ID_SEARCH_BY_CASE_THREAD_TITLE'),
detail: "",
tagText: "",
items:[

2
resources/assets/js/components/search/popovers/CaseTitle.vue
View File

@@ -18,7 +18,7 @@
<b-form-input
id="name-input"
v-model="filter[0].value"
:placeholder="$t('ID_TASK_THREAD_TITLE_NAME')"
:placeholder="$t('ID_CASE_THREAD_TITLE_NAME')"
:state="valueState"
required
></b-form-input>

6
resources/assets/js/home/CustomCaseList/CustomCaseList.vue
View File

@@ -551,10 +551,10 @@ export default {
type: "CaseTitle",
id: "caseTitle",
title: `${this.$i18n.t("ID_FILTER")}: ${this.$i18n.t(
"ID_BY_TASK_THREAD_TITLE"
"ID_BY_CASE_THREAD_TITLE"
)}`,
optionLabel: this.$i18n.t("ID_BY_TASK_THREAD_TITLE"),
tagPrefix: this.$i18n.t("ID_SEARCH_BY_TASK_THREAD_TITLE"),
optionLabel: this.$i18n.t("ID_BY_CASE_THREAD_TITLE"),
tagPrefix: this.$i18n.t("ID_SEARCH_BY_CASE_THREAD_TITLE"),
detail: "",
tagText: "",
items: [

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

@@ -3083,6 +3083,12 @@ msgstr "Buy now"
msgid "By Case #"
msgstr "By Case #"
# TRANSLATION
# LABEL/ID_BY_CASE_THREAD_TITLE
#: LABEL/ID_BY_CASE_THREAD_TITLE
msgid "By Case Thread Title"
msgstr "By Case Thread Title"
# TRANSLATION
# LABEL/ID_BY_CASE_TITLE
#: LABEL/ID_BY_CASE_TITLE
@@ -3131,12 +3137,6 @@ msgstr "By Process Name"
msgid "By Task"
msgstr "By Task"
# TRANSLATION
# LABEL/ID_BY_TASK_THREAD_TITLE
#: LABEL/ID_BY_TASK_THREAD_TITLE
msgid "By Task Thread Title"
msgstr "By Task Thread Title"
# TRANSLATION
# LABEL/ID_BY_STATUS
#: LABEL/ID_BY_STATUS
@@ -24425,6 +24425,12 @@ msgstr "Search also in the APP_UID field"
msgid "Search by Case #:"
msgstr "Search by Case #:"
# TRANSLATION
# LABEL/ID_SEARCH_BY_CASE_THREAD_TITLE
#: LABEL/ID_SEARCH_BY_CASE_THREAD_TITLE
msgid "Search by Case Thread Title:"
msgstr "Search by Case Thread Title:"
# TRANSLATION
# LABEL/ID_SEARCH_BY_CASE_TITLE
#: LABEL/ID_SEARCH_BY_CASE_TITLE
@@ -24485,12 +24491,6 @@ msgstr "Search by Start Date:"
msgid "Search by Status:"
msgstr "Search by Status:"
# TRANSLATION
# LABEL/ID_SEARCH_BY_TASK_THREAD_TITLE
#: LABEL/ID_SEARCH_BY_TASK_THREAD_TITLE
msgid "Search by Task Thread Title:"
msgstr "Search by Task Thread Title:"
# TRANSLATION
# LABEL/ID_SEARCH_BY_TASK_NAME
#: LABEL/ID_SEARCH_BY_TASK_NAME
@@ -26213,18 +26213,6 @@ msgstr "Task properties has been saved successfully"
msgid "Task Reassignments"
msgstr "Task Reassignments"
# TRANSLATION
# LABEL/ID_TASK_THREAD_TITLE
#: LABEL/ID_TASK_THREAD_TITLE
msgid "Task Thread Title"
msgstr "Task Thread Title"
# TRANSLATION
# LABEL/ID_TASK_THREAD_TITLE_NAME
#: LABEL/ID_TASK_THREAD_TITLE_NAME
msgid "Task Thread Title Name"
msgstr "Task Thread Title Name"
# TRANSLATION
# LABEL/ID_TASK_TITLE
#: LABEL/ID_TASK_TITLE
@@ -53253,12 +53241,18 @@ msgstr "Top"
msgid "Top 10"
msgstr "Top 10"
# TRANSLATION
# TRANSLATION
# LABEL/ID_CASE_THREAD_TITLE
#: LABEL/ID_CASE_THREAD_TITLE
msgid "Case Thread Title"
msgstr "Case Thread Title"
# TRANSLATION
# LABEL/ID_CASE_THREAD_TITLE_NAME
#: LABEL/ID_CASE_THREAD_TITLE_NAME
msgid "Case Thread Title Name"
msgstr "Case Thread Title Name"
# TRANSLATION
# LABEL/ID_NO_MORE_INFORMATION
#: LABEL/ID_NO_MORE_INFORMATION

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

@@ -57322,6 +57322,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_BUTTON','en','Button','2014-01-15') ,
( 'LABEL','ID_BUY_NOW','en','Buy now','2014-09-18') ,
( 'LABEL','ID_BY_CASE_NUMBER','en','By Case #','2020-12-16') ,
( 'LABEL','ID_BY_CASE_THREAD_TITLE','en','By Case Thread Title','2021-09-29') ,
( 'LABEL','ID_BY_CASE_TITLE','en','By Case Title','2020-12-16') ,
( 'LABEL','ID_BY_CURRENT_USER','en','By Current User','2021-07-13') ,
( 'LABEL','ID_BY_DELEGATION_DATE','en','By Delegation Date','2021-08-31') ,
@@ -57330,7 +57331,6 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_BY_PROCESS_CATEGORY','en','By Process Category','2021-07-13') ,
( 'LABEL','ID_BY_PROCESS_NAME','en','By Process Name','2020-12-16') ,
( 'LABEL','ID_BY_TASK','en','By Task','2020-12-16') ,
( 'LABEL','ID_BY_TASK_THREAD_TITLE','en','By Task Thread Title','2021-09-17') ,
( 'LABEL','ID_BY_ROLE','en','By Role','2020-12-15') ,
( 'LABEL','ID_BY_SEND_BY','en','By Send By','2021-08-31') ,
( 'LABEL','ID_BY_STATUS','en','By Status','2020-12-16') ,
@@ -57404,6 +57404,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_CASE_DELETE_SUCCESFULLY','en','The Case was deleted successfully.','2020-01-08') ,
( 'LABEL','ID_CASE_UID','en','Case Uid','2021-04-04') ,
( 'LABEL','ID_CASE_THREAD_TITLE','en','Case Thread Title','2021-08-27') ,
( 'LABEL','ID_CASE_THREAD_TITLE_NAME','en','Case Thread Title Name','2021-09-29') ,
( 'LABEL','ID_CASES','en','HOME','2014-01-15') ,
( 'LABEL','ID_CASES1','en','Cases','2015-12-15') ,
( 'LABEL','ID_CASES_DELETE_SUCCESFULLY','en','All Cases were deleted successfully.','2020-01-08') ,
@@ -60994,6 +60995,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_SEARCHING_UNEXPECTED_ERROR_DEFAULT','en','An unexpected error occurred while searching for your results. Please contact your administrator.','2019-05-15') ,
( 'LABEL','ID_SEARCH_ALSO_APP_UID','en','Search also in the APP_UID field','2014-10-30') ,
( 'LABEL','ID_SEARCH_BY_CASE_NUMBER','en','Search by Case #:','2020-12-16') ,
( 'LABEL','ID_SEARCH_BY_CASE_THREAD_TITLE','en','Search by Case Thread Title:','2021-09-29') ,
( 'LABEL','ID_SEARCH_BY_CASE_TITLE','en','Search by Case Title:','2020-12-16') ,
( 'LABEL','ID_SEARCH_BY_DELEGATION_DATE','en','Search by Delegation Date:','2021-08-31') ,
( 'LABEL','ID_SEARCH_BY_CURRENT_USER','en','Search by Current User:','2021-07-13') ,
@@ -61004,7 +61006,6 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_SEARCH_BY_SEND_BY','en','Search By Send By:','2021-08-31') ,
( 'LABEL','ID_SEARCH_BY_START_DATE','en','Search by Start Date:','2020-12-16') ,
( 'LABEL','ID_SEARCH_BY_STATUS','en','Search by Status:','2020-12-22') ,
( 'LABEL','ID_SEARCH_BY_TASK_THREAD_TITLE','en','Search by Task Thread Title:','2021-09-17') ,
( 'LABEL','ID_SEARCH_BY_TASK_NAME','en','Search by Task Name:','2020-12-16') ,
( 'LABEL','ID_SEARCH_FOR_USER','en','Search for user','2015-09-15') ,
( 'LABEL','ID_SEARCH_FOR_ICON','en','Search for user','2021-09-06') ,
@@ -61306,8 +61307,6 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_TASK_OVERDUE','en','Overdue','2015-06-09') ,
( 'LABEL','ID_TASK_PROPERTIES_SAVE','en','Task properties has been saved successfully','2014-01-15') ,
( 'LABEL','ID_TASK_REASSIGNMENTS','en','Task Reassignments','2020-12-07') ,
( 'LABEL','ID_TASK_THREAD_TITLE','en','Task Thread Title','2021-09-17') ,
( 'LABEL','ID_TASK_THREAD_TITLE_NAME','en','Task Thread Title Name','2021-09-17') ,
( 'LABEL','ID_TASK_TITLE','en','Task Title','2020-12-17') ,
( 'LABEL','ID_TASK_TRANSFER','en','Task Transfer Date','2014-01-15') ,
( 'LABEL','ID_TASK_WAS_ASSIGNED_TO_USER','en','Manual assignment shouldn''t be used with sub-processes.<br>The task "{0}" from case {1} was assigned to user <b>{2}</b> ( {3} {4} )','2015-02-24') ,