diff --git a/gulliver/js/maborak/core/module.panel.js b/gulliver/js/maborak/core/module.panel.js index fb01b4a17..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"); @@ -775,6 +776,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 e733e1865..f86a72d70 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': @@ -91,41 +113,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 ) { + 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' : - if (getField('TAS_DEF_MESSAGE_TEMPLATE').value.trim() == '' ){ + 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' ) + + 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..f55035db9 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/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(); } diff --git a/workflow/engine/xmlform/tasks/tasks_Notifications.xml b/workflow/engine/xmlform/tasks/tasks_Notifications.xml index 2c0c07f89..e195ae6b7 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