From 38a29b5e2fd6c8835fc362f7288a31ed9705dca3 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Fri, 29 Jun 2012 18:04:39 -0400 Subject: [PATCH 1/4] BUG 9334 Change Plain Text to HTML and then try to select again Plain SOLVED - I add validate event change in dropdown - I resolved the BUG 9335 - I validate the tab notification --- gulliver/js/maborak/core/module.panel.js | 7 +- .../js/processmap/core/processes_Map.js | 25 ++- .../engine/js/processmap/core/processmap.js | 14 +- .../xmlform/tasks/tasks_Notifications.xml | 142 ++++++++++++++---- 4 files changed, 150 insertions(+), 38 deletions(-) diff --git a/gulliver/js/maborak/core/module.panel.js b/gulliver/js/maborak/core/module.panel.js index fb01b4a17..5f651e9b0 100755 --- a/gulliver/js/maborak/core/module.panel.js +++ b/gulliver/js/maborak/core/module.panel.js @@ -690,7 +690,7 @@ leimnud.Package.Public({ this.parent.dom.setStyle(this.elements.resize,{background:"transparent"}); } }; - this.makeTab=function(dynamic) + this.makeTab=function(dynamic, styleTabs) { if(this.loading===true){return false;} var thm = this.tab.display==="vertical"?"":"H"; @@ -775,6 +775,11 @@ leimnud.Package.Public({ } this.parent.dom.setStyle(tls,this.setStyle.tabOption || {}); } + if (typeof(this.flag) != "undefined") { + delete this.flag; + return true; + } + this.parent.dom.setStyle(tb,this.setStyle.tabOptionSelected || {}); if(!this.tab.options[this.tabSelected].noClear) { diff --git a/workflow/engine/js/processmap/core/processes_Map.js b/workflow/engine/js/processmap/core/processes_Map.js index 2b5ee9ee8..ea96904cd 100755 --- a/workflow/engine/js/processmap/core/processes_Map.js +++ b/workflow/engine/js/processmap/core/processes_Map.js @@ -91,41 +91,56 @@ var saveDataTaskTemporal = function(iForm) case 7: case '7': if ( getField('SEND_EMAIL') != null && (typeof (getField('SEND_EMAIL')) != 'undefined' ) ) { + oTaskData.SEND_EMAIL = getField('SEND_EMAIL').checked ? 'TRUE' : 'FALSE'; + oTaskData.TAS_DEF_MESSAGE_TYPE = getField('TAS_DEF_MESSAGE_TYPE').value; + oTaskData.TAS_DEF_MESSAGE = getField('TAS_DEF_MESSAGE').value.replace(re, "@amp@"); + oTaskData.TAS_DEF_SUBJECT_MESSAGE = getField('TAS_DEF_SUBJECT_MESSAGE').value; + oTaskData.TAS_DEF_MESSAGE_TEMPLATE = getField('TAS_DEF_MESSAGE_TEMPLATE').value; + // validate fields TAS_DEF_SUBJECT_MESSAGE, TAS_DEF_MESSAGE if (getField('SEND_EMAIL').checked) { + var fieldEval = new input(getField('TAS_DEF_SUBJECT_MESSAGE')); if (getField('TAS_DEF_SUBJECT_MESSAGE').value.trim() == '') { + fieldEval.failed(); new leimnud.module.app.alert().make( { label : G_STRINGS.ID_SUBJECT_FIELD_REQUIRED }); return false; + } else { + fieldEval.passed(); } switch ( getField('TAS_DEF_MESSAGE_TYPE').value ) { case 'text' : + var vmesn = new input(getField('TAS_DEF_MESSAGE')); if (getField('TAS_DEF_MESSAGE').value.trim() == '' ) { + vmesn.failed(); new leimnud.module.app.alert().make( { label : G_STRINGS.ID_MESSAGE_FIELD_REQUIRED - }); + }); return false; + } else { + vmesn.passed(); } break; case 'template' : + var vmesn = new input(getField('TAS_DEF_MESSAGE_TEMPLATE')); if (getField('TAS_DEF_MESSAGE_TEMPLATE').value.trim() == '' ){ + vmesn.failed(); new leimnud.module.app.alert().make( { label : G_STRINGS.ID_TEMPLATE_FIELD_REQUIRED }); return false; + } else { + vmesn.passed(); } break; } } + if(typeof getField('SEND_EMAIL') != 'undefined' ) oTaskData.SEND_EMAIL = getField('SEND_EMAIL').checked ? 'TRUE' : 'FALSE'; else oTaskData.SEND_EMAIL = 'FALSE'; - oTaskData.TAS_DEF_MESSAGE = getField('TAS_DEF_MESSAGE').value.replace(re, "@amp@"); - oTaskData.TAS_DEF_SUBJECT_MESSAGE = getField('TAS_DEF_SUBJECT_MESSAGE').value.replace(re, "@amp@"); - oTaskData.TAS_DEF_MESSAGE_TYPE = getField('TAS_DEF_MESSAGE_TYPE').value; - oTaskData.TAS_DEF_MESSAGE_TEMPLATE = getField('TAS_DEF_MESSAGE_TEMPLATE').value; } break; } diff --git a/workflow/engine/js/processmap/core/processmap.js b/workflow/engine/js/processmap/core/processmap.js index 29424d147..b9b4274fd 100755 --- a/workflow/engine/js/processmap/core/processmap.js +++ b/workflow/engine/js/processmap/core/processmap.js @@ -1571,7 +1571,19 @@ var processmap=function(){ {simage:"/images/properties.png",text:G_STRINGS.ID_PROCESSMAP_PROPERTIES,launch:this.parent.closure({instance:this,method:function(index){ var panel; var iForm=function(panel,index,ifo){ - saveDataTaskTemporal(ifo); + //saveDataTaskTemporal(ifo); + if(typeof(panel.flag) == 'undefined') { + if ( !saveDataTaskTemporal(ifo)) { + var tabPass = panel.tabSelected; + panel.tabSelected = panel.tabLastSelected; + panel.tabLastSelected = tabPass; + panel.flag = true; + panel.makeTab(); + return false; + } + } + delete panel.flag; + panel.command(panel.loader.show); var r = new this.parent.module.rpc.xmlhttp({ url:this.options.dataServer, diff --git a/workflow/engine/xmlform/tasks/tasks_Notifications.xml b/workflow/engine/xmlform/tasks/tasks_Notifications.xml index 2c0c07f89..3b76a9434 100755 --- a/workflow/engine/xmlform/tasks/tasks_Notifications.xml +++ b/workflow/engine/xmlform/tasks/tasks_Notifications.xml @@ -33,18 +33,6 @@ \ No newline at end of file From 94f4ffb3bab8c832efa3eef8809b7e5d9e4294b1 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Fri, 29 Jun 2012 18:19:06 -0400 Subject: [PATCH 2/4] BUG 9334 I removed variable in function SOLVED - I removed variable in function --- gulliver/js/maborak/core/module.panel.js | 2 +- workflow/engine/js/processmap/core/processes_Map.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gulliver/js/maborak/core/module.panel.js b/gulliver/js/maborak/core/module.panel.js index 5f651e9b0..29a925267 100755 --- a/gulliver/js/maborak/core/module.panel.js +++ b/gulliver/js/maborak/core/module.panel.js @@ -690,7 +690,7 @@ leimnud.Package.Public({ this.parent.dom.setStyle(this.elements.resize,{background:"transparent"}); } }; - this.makeTab=function(dynamic, styleTabs) + this.makeTab=function(dynamic) { if(this.loading===true){return false;} var thm = this.tab.display==="vertical"?"":"H"; diff --git a/workflow/engine/js/processmap/core/processes_Map.js b/workflow/engine/js/processmap/core/processes_Map.js index ea96904cd..978dc7935 100755 --- a/workflow/engine/js/processmap/core/processes_Map.js +++ b/workflow/engine/js/processmap/core/processes_Map.js @@ -116,7 +116,7 @@ var saveDataTaskTemporal = function(iForm) vmesn.failed(); new leimnud.module.app.alert().make( { label : G_STRINGS.ID_MESSAGE_FIELD_REQUIRED - }); + }); return false; } else { vmesn.passed(); From 7a0cbcd4ef60c90cd0660b9cbadaf470f643f907 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Fri, 29 Jun 2012 18:54:24 -0400 Subject: [PATCH 3/4] BUG 9334 check the code standard and required fields SOLVED - I ammend code - I add validate some required fields --- gulliver/js/maborak/core/module.panel.js | 1 + .../js/processmap/core/processes_Map.js | 28 +++++++++++++++++-- .../engine/js/processmap/core/processmap.js | 2 +- .../xmlform/tasks/tasks_Notifications.xml | 8 +++--- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/gulliver/js/maborak/core/module.panel.js b/gulliver/js/maborak/core/module.panel.js index 29a925267..45d047a61 100755 --- a/gulliver/js/maborak/core/module.panel.js +++ b/gulliver/js/maborak/core/module.panel.js @@ -693,6 +693,7 @@ leimnud.Package.Public({ this.makeTab=function(dynamic) { if(this.loading===true){return false;} + var thm = this.tab.display==="vertical"?"":"H"; var tb =this.elements.tabOptions[this.tabSelected]; tb.className="panel_tabOptionSelected"+thm+"___"+this.getTheme("tabOptionSelected"); diff --git a/workflow/engine/js/processmap/core/processes_Map.js b/workflow/engine/js/processmap/core/processes_Map.js index 978dc7935..d13368eb1 100755 --- a/workflow/engine/js/processmap/core/processes_Map.js +++ b/workflow/engine/js/processmap/core/processes_Map.js @@ -21,6 +21,17 @@ var saveDataTaskTemporal = function(iForm) oTaskData.TAS_START = (getField('TAS_START').checked ? 'TRUE' : 'FALSE'); oTaskData.TAS_PRIORITY_VARIABLE = getField('TAS_PRIORITY_VARIABLE').value; oTaskData.TAS_DERIVATION_SCREEN_TPL = getField('TAS_DERIVATION_SCREEN_TPL').value; + + var fieldEval = new input(getField('TAS_TITLE')); + if (getField('TAS_TITLE').value.trim() == '') { + fieldEval.failed(); + new leimnud.module.app.alert().make( { + label : _('ID_NAME_TAS_TITLE_REQUIRE') + }); + return false; + } else { + fieldEval.passed(); + } break; case 2: case '2': @@ -65,6 +76,17 @@ var saveDataTaskTemporal = function(iForm) oTaskData.TAS_TYPE_DAY = getField('TAS_TYPE_DAY').value; oTaskData.TAS_CALENDAR = getField('TAS_CALENDAR').value; oTaskData.TAS_TRANSFER_FLY = (getField('TAS_TRANSFER_FLY').checked ? 'TRUE' : 'FALSE'); + + var fieldEval = new input(getField('TAS_DURATION')); + if (getField('TAS_DURATION').value.trim() == '') { + fieldEval.failed(); + new leimnud.module.app.alert().make( { + label : _('ID_TAS_DURATION_REQUIRE') + }); + return false; + } else { + fieldEval.passed(); + } break; case 4: case '4': @@ -109,7 +131,7 @@ var saveDataTaskTemporal = function(iForm) } else { fieldEval.passed(); } - switch ( getField('TAS_DEF_MESSAGE_TYPE').value ) { + switch (getField('TAS_DEF_MESSAGE_TYPE').value) { case 'text' : var vmesn = new input(getField('TAS_DEF_MESSAGE')); if (getField('TAS_DEF_MESSAGE').value.trim() == '' ) { @@ -124,7 +146,7 @@ var saveDataTaskTemporal = function(iForm) break; case 'template' : var vmesn = new input(getField('TAS_DEF_MESSAGE_TEMPLATE')); - if (getField('TAS_DEF_MESSAGE_TEMPLATE').value.trim() == '' ){ + if (getField('TAS_DEF_MESSAGE_TEMPLATE').value.trim() == ''){ vmesn.failed(); new leimnud.module.app.alert().make( { label : G_STRINGS.ID_TEMPLATE_FIELD_REQUIRED @@ -137,7 +159,7 @@ var saveDataTaskTemporal = function(iForm) } } - if(typeof getField('SEND_EMAIL') != 'undefined' ) + if(typeof getField('SEND_EMAIL') != 'undefined') oTaskData.SEND_EMAIL = getField('SEND_EMAIL').checked ? 'TRUE' : 'FALSE'; else oTaskData.SEND_EMAIL = 'FALSE'; diff --git a/workflow/engine/js/processmap/core/processmap.js b/workflow/engine/js/processmap/core/processmap.js index b9b4274fd..f55035db9 100755 --- a/workflow/engine/js/processmap/core/processmap.js +++ b/workflow/engine/js/processmap/core/processmap.js @@ -1573,7 +1573,7 @@ var processmap=function(){ var iForm=function(panel,index,ifo){ //saveDataTaskTemporal(ifo); if(typeof(panel.flag) == 'undefined') { - if ( !saveDataTaskTemporal(ifo)) { + if (!saveDataTaskTemporal(ifo)) { var tabPass = panel.tabSelected; panel.tabSelected = panel.tabLastSelected; panel.tabLastSelected = tabPass; diff --git a/workflow/engine/xmlform/tasks/tasks_Notifications.xml b/workflow/engine/xmlform/tasks/tasks_Notifications.xml index 3b76a9434..e195ae6b7 100755 --- a/workflow/engine/xmlform/tasks/tasks_Notifications.xml +++ b/workflow/engine/xmlform/tasks/tasks_Notifications.xml @@ -74,10 +74,10 @@ } else { fieldEval.passed(); } - switch ( getField('TAS_DEF_MESSAGE_TYPE').value ) { + switch (getField('TAS_DEF_MESSAGE_TYPE').value) { case 'text' : var vmesn = new input(getField('TAS_DEF_MESSAGE')); - if (getField('TAS_DEF_MESSAGE').value.trim() == '' ) { + if (getField('TAS_DEF_MESSAGE').value.trim() == '') { new leimnud.module.app.alert().make( { label : G_STRINGS.ID_MESSAGE_FIELD_REQUIRED }); @@ -88,7 +88,7 @@ break; case 'template' : var vmesn = new input(getField('TAS_DEF_MESSAGE_TEMPLATE')); - if (getField('TAS_DEF_MESSAGE_TEMPLATE').value.trim() == '' ){ + if (getField('TAS_DEF_MESSAGE_TEMPLATE').value.trim() == ''){ new leimnud.module.app.alert().make( { label : G_STRINGS.ID_TEMPLATE_FIELD_REQUIRED }); @@ -158,7 +158,7 @@ var _oVarsPanel_; var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol) { - if( sProcess == '') { + if(sProcess == '') { sProcess = @@PRO_UID; } _oVarsPanel_ = new leimnud.module.panel(); From 629dfae161e068457aa713d12e5ef303e82998af Mon Sep 17 00:00:00 2001 From: Hector Cortez Date: Mon, 2 Jul 2012 10:00:22 -0400 Subject: [PATCH 4/4] BUG 9353 PHP Short tags errors in Webservices test SOLVED - On a system with short tags disabled Webservices test is not working - Change Short tags by standardization of the code. --- workflow/engine/methods/login/sysLogin.php | 2 +- workflow/engine/methods/setup/webServices.php | 6 +++--- workflow/engine/templates/dynaforms/fieldsHandler.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/workflow/engine/methods/login/sysLogin.php b/workflow/engine/methods/login/sysLogin.php index 8439fa366..47dcaf904 100755 --- a/workflow/engine/methods/login/sysLogin.php +++ b/workflow/engine/methods/login/sysLogin.php @@ -137,7 +137,7 @@ G::RenderPage ( "publish" ); // note added by carlos pacha carlos[at]colosa[dot]com pckrlos[at]gmail[dot]com // the following lines of code are getting the hight of panel. Related 8021 bug var hightpnl= 424; - var varjs = ""; + var varjs = ""; if(varjs !=' ') hightpnl= 330; diff --git a/workflow/engine/methods/setup/webServices.php b/workflow/engine/methods/setup/webServices.php index da38cb276..b0092e326 100755 --- a/workflow/engine/methods/setup/webServices.php +++ b/workflow/engine/methods/setup/webServices.php @@ -58,9 +58,9 @@ if($RBAC->userCanAccess('PM_SETUP') != 1 && $RBAC->userCanAccess('PM_FACTORY') ! var oAux = document.getElementById("publisherContent[0]"); oAux.id = "publisherContent[666]"; var currentGroup=false; - + function webServicesSetup(){ - popupWindow('' , '' , 500 , 225 ); + popupWindow('' , '' , 500 , 225 ); } function showFormWS( uid, element ){ @@ -134,7 +134,7 @@ if($RBAC->userCanAccess('PM_SETUP') != 1 && $RBAC->userCanAccess('PM_FACTORY') ! } function refreshTree(){ - tree.refresh( document.getElementById("publisherContent[666]") , ''); + tree.refresh( document.getElementById("publisherContent[666]") , ''); } function showDetails(){ diff --git a/workflow/engine/templates/dynaforms/fieldsHandler.php b/workflow/engine/templates/dynaforms/fieldsHandler.php index 75cf61bfe..e9ce163da 100755 --- a/workflow/engine/templates/dynaforms/fieldsHandler.php +++ b/workflow/engine/templates/dynaforms/fieldsHandler.php @@ -195,7 +195,7 @@ var client_window = parent.getClientWindowSize(); h = client_window.height; h1 = (h / 100) * 92; - window.parent.popupWindow('', "fields_Edit?A=&XMLNODE_NAME="+ uid , 600, h1); + window.parent.popupWindow('', "fields_Edit?A=&XMLNODE_NAME="+ uid , 600, h1); } @@ -206,7 +206,7 @@ $.ajax({ type: "POST", url: "fields_Delete", - data: 'A=&XMLNODE_NAME='+uid, + data: 'A=&XMLNODE_NAME='+uid, success: function(httpResponse){ window.parent.dynaformEditor.refreshFieldsList(); }