From 51ddae120294d4b9436a992d03f46369421b93ce Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Wed, 14 Nov 2012 13:42:31 -0400 Subject: [PATCH 1/5] BUG 10027 Request for Dynaform Editing, a way to edit various dynaforms simply SOLVED - Added a dropdown with the dynaforms list to change the dynaform editing inside the dynaforms editor --- .../engine/classes/class.dynaformEditor.php | 2 +- workflow/engine/classes/class.toolBar.php | 23 +++++++++++++++++++ .../xmlform/dynaforms/fields_Toolbar.xml | 4 ++++ .../xmlform/dynaforms/fields_ToolbarGrid.xml | 4 ++++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.dynaformEditor.php b/workflow/engine/classes/class.dynaformEditor.php index 73026da71..ec01b0181 100755 --- a/workflow/engine/classes/class.dynaformEditor.php +++ b/workflow/engine/classes/class.dynaformEditor.php @@ -169,7 +169,7 @@ class dynaformEditor extends WebResource $oHeadPublisher->addScriptCode("var TRANSLATIONS = " . G::json_encode($labesTrans) . ";"); $oHeadPublisher->setTitle(G::LoadTranslation('ID_DYNAFORM_EDITOR') . ' - ' . $Properties['DYN_TITLE']); $G_PUBLISH->AddContent('blank'); - $this->panelConf['title'] = $this->title; + $this->panelConf['title'] = ''; $G_PUBLISH->AddContent('panel-init', 'mainPanel', $this->panelConf); if ($Properties['DYN_TYPE'] == 'xmlform') { $G_PUBLISH->AddContent('xmlform', 'toolbar', 'dynaforms/fields_Toolbar', 'display:none', $Parameters, '', ''); diff --git a/workflow/engine/classes/class.toolBar.php b/workflow/engine/classes/class.toolBar.php index 46336aed4..0c7bbd5af 100755 --- a/workflow/engine/classes/class.toolBar.php +++ b/workflow/engine/classes/class.toolBar.php @@ -155,6 +155,29 @@ class XmlForm_Field_toolButton extends XmlForm_Field case 'text/image': $html = $this->htmlentities( $this->label, ENT_QUOTES, 'utf-8' ) . '
style) ? ' style="' . $this->style . '"' : '') . '/>'; break; + case 'dropdown': + $html = ''; + if (isset($this->owner->values['PRO_UID'])) { + G::LoadClass('processMap'); + $criteria = processMap::getDynaformsCriteria($this->owner->values['PRO_UID']); + $dataset = DynaformPeer::doSelectRS($criteria); + if ($dataset->getRecordCount() > 0) { + $html .= '' . G::LoadTranslation('ID_EDITING_DYNAFORM'); + $html .= ': '; + } + } + return $html; + break; case 'class': $html = '
diff --git a/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml b/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml index b4e2bbf64..d8ba50262 100755 --- a/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml +++ b/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml @@ -1,5 +1,7 @@ + + Save @@ -92,4 +94,6 @@ Grid + + \ No newline at end of file diff --git a/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml b/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml index 0a8aec0d0..e3048ab0e 100755 --- a/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml +++ b/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml @@ -1,5 +1,7 @@ + + Save @@ -49,4 +51,6 @@ File + + \ No newline at end of file From 893767b88b52c593c6862b243ce3a19fad2d6b4c Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Wed, 14 Nov 2012 15:45:13 -0400 Subject: [PATCH 2/5] Delete script nodes to load draw2d.js file (deprecated) --- workflow/engine/skinEngine/base/extJsInitLoad.html | 10 ++-------- .../engine/skinEngine/simplified/extJsInitLoad.html | 10 ++-------- workflow/engine/skinEngine/uxmodern/extJsInitLoad.html | 10 ++-------- workflow/engine/skinEngine/uxs/extJsInitLoad.html | 10 ++-------- 4 files changed, 8 insertions(+), 32 deletions(-) diff --git a/workflow/engine/skinEngine/base/extJsInitLoad.html b/workflow/engine/skinEngine/base/extJsInitLoad.html index 13d7ba79d..c5e9b9e98 100755 --- a/workflow/engine/skinEngine/base/extJsInitLoad.html +++ b/workflow/engine/skinEngine/base/extJsInitLoad.html @@ -35,7 +35,7 @@ #loading-msg { font: bold 11px arial,tahoma,sans-serif; } - + @@ -56,15 +56,9 @@ - - {styles} - + {bodyTemplate} diff --git a/workflow/engine/skinEngine/simplified/extJsInitLoad.html b/workflow/engine/skinEngine/simplified/extJsInitLoad.html index 49815f887..d4b183b2e 100755 --- a/workflow/engine/skinEngine/simplified/extJsInitLoad.html +++ b/workflow/engine/skinEngine/simplified/extJsInitLoad.html @@ -36,7 +36,7 @@ #loading-msg { font: bold 11px arial,tahoma,sans-serif; } - + @@ -57,15 +57,9 @@ - - {styles} - + {bodyTemplate} diff --git a/workflow/engine/skinEngine/uxmodern/extJsInitLoad.html b/workflow/engine/skinEngine/uxmodern/extJsInitLoad.html index 13d7ba79d..c5e9b9e98 100644 --- a/workflow/engine/skinEngine/uxmodern/extJsInitLoad.html +++ b/workflow/engine/skinEngine/uxmodern/extJsInitLoad.html @@ -35,7 +35,7 @@ #loading-msg { font: bold 11px arial,tahoma,sans-serif; } - + @@ -56,15 +56,9 @@ - - {styles} - + {bodyTemplate} diff --git a/workflow/engine/skinEngine/uxs/extJsInitLoad.html b/workflow/engine/skinEngine/uxs/extJsInitLoad.html index 13d7ba79d..c5e9b9e98 100644 --- a/workflow/engine/skinEngine/uxs/extJsInitLoad.html +++ b/workflow/engine/skinEngine/uxs/extJsInitLoad.html @@ -35,7 +35,7 @@ #loading-msg { font: bold 11px arial,tahoma,sans-serif; } - + @@ -56,15 +56,9 @@ - - {styles} - + {bodyTemplate} From 3cc3043dc1b61f94c8af85e55b9cab95cd016515 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Wed, 14 Nov 2012 16:04:36 -0400 Subject: [PATCH 3/5] BUG 9926 Add a new RTL Skin to support Arabic Language SOLVED - No was regenerate table translation from translation-repair. - was add call. --- workflow/engine/classes/class.wsTools.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index f1b5b39b5..0965d570c 100755 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -315,6 +315,8 @@ class workspaceTools } elseif ($first) { CLI::logging( "Updating XML form translations with $poName\n" ); Language::import( $poFile, true, false ); + CLI::logging( "Updating database translations with $poName\n" ); + Language::import( $poFile, false, true ); } } } From b123ddf1c37a27357346303b12bdb08239238245 Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Wed, 14 Nov 2012 16:15:14 -0400 Subject: [PATCH 4/5] BUG 8541 "Al hacer click sobre un boton, este se queda en..." SOLVED - In PROCESSMAKER>DESIGNER>DYNAFORMS>Edit>HTML "Restore Original HTML" and "Refresh View" buttons remain active after being clicked - Fixed, now the buttons are reset to it's initial state * Available from version 2.0.46 --- .../engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml b/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml index bb743aeec..5c9a5192f 100755 --- a/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml +++ b/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml @@ -9,11 +9,11 @@ Enable HTML Editing - + Restore Original HTML - + Refresh View @@ -79,13 +79,14 @@ getField("PME_HTML_ENABLETEMPLATE","dynaforms_HtmlEditor").onclick=function() label: "@G::LoadTranslation(ID_MSG_ENABLE_HTML_EDITING)", size:{ w: 350, h: 150 }, action: function() { }, - cancel: function() { + cancel: function () { getField("PME_HTML_ENABLETEMPLATE","dynaforms_HtmlEditor").checked = false; } }); - dynaformEditor.setEnableTemplate( this.checked ); + + dynaformEditor.setEnableTemplate(this.checked); } } ]]> - \ No newline at end of file + \ No newline at end of file From d236e4031c8850592e914563a1c7c83d6b660f7a Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Wed, 14 Nov 2012 17:15:13 -0400 Subject: [PATCH 5/5] BUG 9882: Case List, [Unassigned] SOLVED - When a case is unassigned the current user column is empty - When a case is unassigned show the label [UNASSIGNED] --- workflow/engine/classes/class.applications.php | 1 + workflow/engine/templates/cases/casesList.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.applications.php b/workflow/engine/classes/class.applications.php index a79397e1d..8a17cc8f5 100644 --- a/workflow/engine/classes/class.applications.php +++ b/workflow/engine/classes/class.applications.php @@ -149,6 +149,7 @@ class Applications $Criteria->addAlias( 'CU', 'USERS' ); $Criteria->addJoin( AppCacheViewPeer::USR_UID, 'CU.USR_UID', Criteria::LEFT_JOIN ); + $Criteria->addAsColumn( 'USR_UID', 'CU.USR_UID' ); $Criteria->addAsColumn( 'USR_FIRSTNAME', 'CU.USR_FIRSTNAME' ); $Criteria->addAsColumn( 'USR_LASTNAME', 'CU.USR_LASTNAME' ); $Criteria->addAsColumn( 'USR_USERNAME', 'CU.USR_USERNAME' ); diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index be86dcea1..3502eb10f 100644 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -491,7 +491,7 @@ Ext.onReady ( function() { return _FNF(s.data.USR_USERNAME, s.data.USR_FIRSTNAME, s.data.USR_LASTNAME); } else { - return ''; + return '[' + _('ID_UNASSIGNED').toUpperCase() + ']'; } };