From 72636d9e78940531758b893f1d210000ce0d28b3 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Mon, 11 May 2015 15:09:54 -0400 Subject: [PATCH 1/5] =?UTF-8?q?PM-2655=20CaseNote:=20Te=20permite=20enviar?= =?UTF-8?q?=20un=20case=20note=20con=20espacios.=20Causa=20:=20Definida=20?= =?UTF-8?q?asi.=20Soluci=C3=B3=20Se=20agrego=20una=20validaci=C3=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/templates/app/main.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/workflow/engine/templates/app/main.js b/workflow/engine/templates/app/main.js index 70fdbb402..e1995d6cd 100644 --- a/workflow/engine/templates/app/main.js +++ b/workflow/engine/templates/app/main.js @@ -213,13 +213,18 @@ function openCaseNotesWindow(appUid1, delIndex, modalSw, appTitle, proUid, taskU growMin: 40, growMax: 80, maxLengthText : 500, - allowBlank :true, + allowBlank :false, selectOnFocus :true, enableKeyEvents: true, listeners : { scope : this, keyup : updateTextCtr, - keydown: updateTextCtr + keydown: updateTextCtr, + 'change': function(field, newVal, oldVal){ + var textAreaValue = newVal.replace(/^\s+/,'').replace(/\s+$/,''); + field.setValue(textAreaValue.trim()); + Ext.getCmp('caseNoteText').focus(false, 200); + } } }) ], From b03cc473e5dbc7994bea9632f0021d35247e8bf4 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Tue, 12 May 2015 14:46:20 -0400 Subject: [PATCH 2/5] PM-1130 --- workflow/engine/classes/class.pmFunctions.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php index d3b12fed6..4b685fe08 100755 --- a/workflow/engine/classes/class.pmFunctions.php +++ b/workflow/engine/classes/class.pmFunctions.php @@ -2820,7 +2820,9 @@ function PMFAddCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendM function PMFAddAttachmentToArray($arrayData, $index, $value, $suffix = " Copy({i})") { if (isset($suffix) && $suffix == "") { - $suffix = " Copy ({i})"; + $suffix = " Copy({i} + + )"; } $newIndex = $index; From 6172b33e1bb66346d3d2ac25f03bb9819dfc33bb Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Tue, 12 May 2015 17:43:51 -0400 Subject: [PATCH 3/5] PM-2694 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Estandarizacióe "Placeholder" para al campo "Search" en los listados para el "Classic Designer" Se cambio el texto del placeholder de los campos de busqueda --- workflow/engine/templates/admin/uxUsersList.js | 4 ++-- workflow/engine/templates/authSources/authSourcesList.js | 2 +- workflow/engine/templates/cases/casesSchedulerLog.js | 2 +- workflow/engine/templates/emailServer/emailServer.js | 2 +- workflow/engine/templates/groups/groupsList.js | 2 +- workflow/engine/templates/pmTables/data.js | 2 +- workflow/engine/templates/pmTables/edit.js | 4 ++-- workflow/engine/templates/pmTables/editReport.js | 6 +++--- workflow/engine/templates/pmTables/list.js | 2 +- .../engine/templates/processCategory/processCategoryList.js | 2 +- workflow/engine/templates/processes/main.js | 2 +- workflow/engine/templates/reportTables/edit.js | 4 ++-- workflow/engine/templates/reportTables/main.js | 2 +- workflow/engine/templates/roles/rolesList.js | 2 +- workflow/engine/templates/setup/calendarList.js | 2 +- workflow/engine/templates/setup/skinList.js | 2 +- workflow/engine/templates/users/usersList.js | 2 +- workflow/engine/xmlform/cases/cases_Scheduler_Options.xml | 1 + .../engine/xmlform/dbConnections/dbConnections_Options.xml | 1 + workflow/engine/xmlform/dynaforms/dynaforms_Options.xml | 1 + workflow/engine/xmlform/inputdocs/inputdocs_Options.xml | 1 + workflow/engine/xmlform/outputdocs/outputdocs_Options.xml | 1 + .../processes/processes_availableProcessesUserOptions.xml | 3 +++ workflow/engine/xmlform/triggers/triggers_Options.xml | 1 + workflow/engine/xmlform/users/users_Searchx.xml | 4 +++- 25 files changed, 34 insertions(+), 23 deletions(-) diff --git a/workflow/engine/templates/admin/uxUsersList.js b/workflow/engine/templates/admin/uxUsersList.js index d707bf816..7d4a4472f 100755 --- a/workflow/engine/templates/admin/uxUsersList.js +++ b/workflow/engine/templates/admin/uxUsersList.js @@ -35,7 +35,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 150, - emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term', + emptyText: _('ID_EMPTY_SEARCH'),//'enter search term', listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { @@ -353,7 +353,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 150, - emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term', + emptyText: _('ID_EMPTY_SEARCH'),//'enter search term', listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { diff --git a/workflow/engine/templates/authSources/authSourcesList.js b/workflow/engine/templates/authSources/authSourcesList.js index 1a3116a9f..f4a9c434c 100755 --- a/workflow/engine/templates/authSources/authSourcesList.js +++ b/workflow/engine/templates/authSources/authSourcesList.js @@ -107,7 +107,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 150, - emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term', + emptyText: _('ID_EMPTY_SEARCH'),//'enter search term', listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { diff --git a/workflow/engine/templates/cases/casesSchedulerLog.js b/workflow/engine/templates/cases/casesSchedulerLog.js index f227d49f1..ff231fe6d 100755 --- a/workflow/engine/templates/cases/casesSchedulerLog.js +++ b/workflow/engine/templates/cases/casesSchedulerLog.js @@ -61,7 +61,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 150, - emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term', + emptyText: _('ID_EMPTY_SEARCH'),//'enter search term', listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { diff --git a/workflow/engine/templates/emailServer/emailServer.js b/workflow/engine/templates/emailServer/emailServer.js index b9cdd52ea..540afe30b 100644 --- a/workflow/engine/templates/emailServer/emailServer.js +++ b/workflow/engine/templates/emailServer/emailServer.js @@ -932,7 +932,7 @@ emailServer.application = { var txtSearch = new Ext.form.TextField({ id: "txtSearch", - emptyText: _("ID_ENTER_SEARCH_TERM"), + emptyText: _("ID_EMPTY_SEARCH"), width: 150, allowBlank: true, diff --git a/workflow/engine/templates/groups/groupsList.js b/workflow/engine/templates/groups/groupsList.js index 1b38439bc..c4cb48656 100755 --- a/workflow/engine/templates/groups/groupsList.js +++ b/workflow/engine/templates/groups/groupsList.js @@ -107,7 +107,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 150, - emptyText: _('ID_ENTER_SEARCH_TERM'), + emptyText: _('ID_EMPTY_SEARCH'), listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { diff --git a/workflow/engine/templates/pmTables/data.js b/workflow/engine/templates/pmTables/data.js index 2f2b045d4..e117afd78 100755 --- a/workflow/engine/templates/pmTables/data.js +++ b/workflow/engine/templates/pmTables/data.js @@ -90,7 +90,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 150, - emptyText: _('ID_ENTER_SEARCH_TERM'), + emptyText: _('ID_EMPTY_SEARCH'), listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { diff --git a/workflow/engine/templates/pmTables/edit.js b/workflow/engine/templates/pmTables/edit.js index 9c8fc1620..204b9aa3a 100644 --- a/workflow/engine/templates/pmTables/edit.js +++ b/workflow/engine/templates/pmTables/edit.js @@ -568,7 +568,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 110, - emptyText: _('ID_ENTER_SEARCH_TERM'), + emptyText: _('ID_EMPTY_SEARCH'), listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { @@ -583,7 +583,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 110, - emptyText: _('ID_ENTER_SEARCH_TERM'), + emptyText: _('ID_EMPTY_SEARCH'), listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { diff --git a/workflow/engine/templates/pmTables/editReport.js b/workflow/engine/templates/pmTables/editReport.js index 9ebf235ec..0a4e678ab 100755 --- a/workflow/engine/templates/pmTables/editReport.js +++ b/workflow/engine/templates/pmTables/editReport.js @@ -172,7 +172,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 220, - emptyText: _('ID_ENTER_SEARCH_TERM'), + emptyText: _('ID_EMPTY_SEARCH'), listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { @@ -696,7 +696,7 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) { ctCls:'pm_search_text_field', allowBlank: true, width: 110, - emptyText: _('ID_ENTER_SEARCH_TERM'), + emptyText: _('ID_EMPTY_SEARCH'), listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { @@ -711,7 +711,7 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) { ctCls:'pm_search_text_field', allowBlank: true, width: 110, - emptyText: _('ID_ENTER_SEARCH_TERM'), + emptyText: _('ID_EMPTY_SEARCH'), listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { diff --git a/workflow/engine/templates/pmTables/list.js b/workflow/engine/templates/pmTables/list.js index 6f614f9f2..c3d8c44c7 100755 --- a/workflow/engine/templates/pmTables/list.js +++ b/workflow/engine/templates/pmTables/list.js @@ -164,7 +164,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 150, - emptyText: _('ID_ENTER_SEARCH_TERM'), + emptyText: _('ID_EMPTY_SEARCH'), listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { diff --git a/workflow/engine/templates/processCategory/processCategoryList.js b/workflow/engine/templates/processCategory/processCategoryList.js index b3de47df1..0c002a44c 100755 --- a/workflow/engine/templates/processCategory/processCategoryList.js +++ b/workflow/engine/templates/processCategory/processCategoryList.js @@ -100,7 +100,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 150, - emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term', + emptyText: _('ID_EMPTY_SEARCH'),//'enter search term', listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index ecd208b4d..d81878208 100755 --- a/workflow/engine/templates/processes/main.js +++ b/workflow/engine/templates/processes/main.js @@ -360,7 +360,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 150, - emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term', + emptyText: _('ID_EMPTY_SEARCH'),//'enter search term', listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { diff --git a/workflow/engine/templates/reportTables/edit.js b/workflow/engine/templates/reportTables/edit.js index 028940566..85c11acf7 100755 --- a/workflow/engine/templates/reportTables/edit.js +++ b/workflow/engine/templates/reportTables/edit.js @@ -367,7 +367,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 110, - emptyText: _('ID_ENTER_SEARCH_TERM'), + emptyText: _('ID_EMPTY_SEARCH'), listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { @@ -382,7 +382,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 110, - emptyText: _('ID_ENTER_SEARCH_TERM'), + emptyText: _('ID_EMPTY_SEARCH'), listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { diff --git a/workflow/engine/templates/reportTables/main.js b/workflow/engine/templates/reportTables/main.js index 640db905c..f2c625d47 100755 --- a/workflow/engine/templates/reportTables/main.js +++ b/workflow/engine/templates/reportTables/main.js @@ -129,7 +129,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 150, - emptyText: _('ID_ENTER_SEARCH_TERM'), + emptyText: _('ID_EMPTY_SEARCH'), listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { diff --git a/workflow/engine/templates/roles/rolesList.js b/workflow/engine/templates/roles/rolesList.js index a091d306d..1835e5c99 100755 --- a/workflow/engine/templates/roles/rolesList.js +++ b/workflow/engine/templates/roles/rolesList.js @@ -114,7 +114,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 150, - emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term', + emptyText: _('ID_EMPTY_SEARCH'),//'enter search term', listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { diff --git a/workflow/engine/templates/setup/calendarList.js b/workflow/engine/templates/setup/calendarList.js index 37d5bf604..8b617ff30 100755 --- a/workflow/engine/templates/setup/calendarList.js +++ b/workflow/engine/templates/setup/calendarList.js @@ -108,7 +108,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 150, - emptyText: _('ID_ENTER_SEARCH_TERM'), + emptyText: _('ID_EMPTY_SEARCH'), listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { diff --git a/workflow/engine/templates/setup/skinList.js b/workflow/engine/templates/setup/skinList.js index 5f9062b6e..3430de29d 100755 --- a/workflow/engine/templates/setup/skinList.js +++ b/workflow/engine/templates/setup/skinList.js @@ -104,7 +104,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 150, - emptyText: _('ID_ENTER_SEARCH_TERM'), + emptyText: _('ID_EMPTY_SEARCH'), listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { diff --git a/workflow/engine/templates/users/usersList.js b/workflow/engine/templates/users/usersList.js index 4cb3965fb..a386e9da7 100755 --- a/workflow/engine/templates/users/usersList.js +++ b/workflow/engine/templates/users/usersList.js @@ -140,7 +140,7 @@ Ext.onReady(function(){ ctCls:'pm_search_text_field', allowBlank: true, width: 100, - emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term', + emptyText: _('ID_EMPTY_SEARCH'),//'enter search term', listeners: { specialkey: function(f,e){ if (e.getKey() == e.ENTER) { diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_Options.xml b/workflow/engine/xmlform/cases/cases_Scheduler_Options.xml index 9ec9bd11c..b1aa61524 100755 --- a/workflow/engine/xmlform/cases/cases_Scheduler_Options.xml +++ b/workflow/engine/xmlform/cases/cases_Scheduler_Options.xml @@ -12,6 +12,7 @@ diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_Options.xml b/workflow/engine/xmlform/dynaforms/dynaforms_Options.xml index aa1bc25aa..daaf5db2b 100755 --- a/workflow/engine/xmlform/dynaforms/dynaforms_Options.xml +++ b/workflow/engine/xmlform/dynaforms/dynaforms_Options.xml @@ -13,6 +13,7 @@ ]]> + \ No newline at end of file diff --git a/workflow/engine/xmlform/triggers/triggers_Options.xml b/workflow/engine/xmlform/triggers/triggers_Options.xml index 929a79476..ddafb3990 100755 --- a/workflow/engine/xmlform/triggers/triggers_Options.xml +++ b/workflow/engine/xmlform/triggers/triggers_Options.xml @@ -19,6 +19,7 @@ - + \ No newline at end of file From 720be1729af2bcd4dc9a8e59d3e9487dcde0b5d2 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Wed, 13 May 2015 15:11:43 -0400 Subject: [PATCH 4/5] PM-1130 --- workflow/engine/classes/class.pmFunctions.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php index 4b685fe08..8bcfea764 100755 --- a/workflow/engine/classes/class.pmFunctions.php +++ b/workflow/engine/classes/class.pmFunctions.php @@ -2820,9 +2820,7 @@ function PMFAddCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendM function PMFAddAttachmentToArray($arrayData, $index, $value, $suffix = " Copy({i})") { if (isset($suffix) && $suffix == "") { - $suffix = " Copy({i} - - )"; + $suffix = " Copy({i})"; } $newIndex = $index; From dc3188542f5d57ff1812a73b7824c53b8061d4a5 Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Thu, 14 May 2015 11:43:22 -0400 Subject: [PATCH 5/5] PM-2694 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Estandarizacióe "Placeholder" para al campo "Search" en los listados para el "Classic Designer" Se cambio el texto del placeholder de los campos de busqueda --- .../xmlform/cases/cases_Scheduler_Options.xml | 24 ++++++++++++++++++- .../dbConnections/dbConnections_Options.xml | 24 +++++++++++++++++-- .../xmlform/dynaforms/dynaforms_Options.xml | 22 ++++++++++++++++- .../xmlform/inputdocs/inputdocs_Options.xml | 22 ++++++++++++++++- .../xmlform/outputdocs/outputdocs_Options.xml | 22 ++++++++++++++++- ...rocesses_availableProcessesUserOptions.xml | 22 ++++++++++++++++- .../xmlform/triggers/triggers_Options.xml | 22 ++++++++++++++++- .../engine/xmlform/users/users_Searchx.xml | 22 ++++++++++++++++- 8 files changed, 171 insertions(+), 9 deletions(-) diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_Options.xml b/workflow/engine/xmlform/cases/cases_Scheduler_Options.xml index b1aa61524..dcb9f0e5d 100755 --- a/workflow/engine/xmlform/cases/cases_Scheduler_Options.xml +++ b/workflow/engine/xmlform/cases/cases_Scheduler_Options.xml @@ -12,7 +12,29 @@ diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_Options.xml b/workflow/engine/xmlform/dynaforms/dynaforms_Options.xml index daaf5db2b..522731663 100755 --- a/workflow/engine/xmlform/dynaforms/dynaforms_Options.xml +++ b/workflow/engine/xmlform/dynaforms/dynaforms_Options.xml @@ -13,7 +13,27 @@ ]]> \ No newline at end of file diff --git a/workflow/engine/xmlform/triggers/triggers_Options.xml b/workflow/engine/xmlform/triggers/triggers_Options.xml index ddafb3990..f61fc968f 100755 --- a/workflow/engine/xmlform/triggers/triggers_Options.xml +++ b/workflow/engine/xmlform/triggers/triggers_Options.xml @@ -19,7 +19,27 @@ \ No newline at end of file