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

Merged in bugfix/PMCORE-3338 (pull request #8142)

Browse Source 
PMCORE-3338

Approved-by: Rodrigo Quelca
This commit is contained in:
Fabio Guachalla
2021-09-20 14:25:06 +00:00
committed by Julio Cesar Laura Avendaño
parent b263dec82e f2f269a2f7
commit d2fef564ef
5 changed files with 35 additions and 7 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_CASE_TITLE')}`,
optionLabel: this.$i18n.t('ID_BY_CASE_TITLE'),
tagPrefix: this.$i18n.t('ID_SEARCH_BY_CASE_TITLE'),
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'),
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_CASE_TITLE')}`,
optionLabel: this.$i18n.t('ID_BY_CASE_TITLE'),
tagPrefix: this.$i18n.t('ID_SEARCH_BY_CASE_TITLE'),
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'),
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_CASE_TITLE_NAME')"
:placeholder="$t('ID_TASK_THREAD_TITLE_NAME')"
:state="valueState"
required
></b-form-input>

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

@@ -3131,6 +3131,12 @@ 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
@@ -24473,6 +24479,12 @@ 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
@@ -26195,6 +26207,18 @@ 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

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

@@ -57330,6 +57330,7 @@ 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') ,
@@ -61001,6 +61002,7 @@ 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') ,
@@ -61302,6 +61304,8 @@ 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') ,