Merge remote branch 'upstream/master' into BUG-9319

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)
 			{

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;
     }

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,

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 = "<?=  isset($_POST['form']['USER_ENV'])?$_POST['form']['USER_ENV']:''; ?>";
+    var varjs = "<?php echo isset($_POST['form']['USER_ENV'])?$_POST['form']['USER_ENV']:''; ?>";
     if(varjs !=' ')
       hightpnl= 330;
     

workflow/engine/methods/setup/webServices.php

@@ -60,7 +60,7 @@ if($RBAC->userCanAccess('PM_SETUP') != 1 && $RBAC->userCanAccess('PM_FACTORY') !
   var currentGroup=false;
 
   function webServicesSetup(){
-    popupWindow('' , '<?=$link_Edit?>' , 500 , 225 );
+    popupWindow('' , '<?php echo $link_Edit ?>' , 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]") , '<?=$link_List?>');
+    tree.refresh( document.getElementById("publisherContent[666]") , '<?php echo $link_List ?>');
   }
 
   function showDetails(){

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=<?=$_SESSION['Current_Dynafom']['Parameters']['URL']?>&XMLNODE_NAME="+ uid , 600, h1);
+		window.parent.popupWindow('', "fields_Edit?A=<?php echo $_SESSION['Current_Dynafom']['Parameters']['URL']?>&XMLNODE_NAME="+ uid , 600, h1);
 		
 	}
 	
@@ -206,7 +206,7 @@
 				$.ajax({
 				   type: "POST",
 				   url: "fields_Delete",
-				   data: 'A=<?=$_SESSION['Current_Dynafom']['Parameters']['URL']?>&XMLNODE_NAME='+uid,
+				   data: 'A=<?php echo $_SESSION['Current_Dynafom']['Parameters']['URL']?>&XMLNODE_NAME='+uid,
 				   success: function(httpResponse){
 						window.parent.dynaformEditor.refreshFieldsList();
 				   }

workflow/engine/xmlform/tasks/tasks_Notifications.xml

@@ -33,18 +33,6 @@
 
   <JS type="javascript"><![CDATA[
   
-  /* Recovery data */
-  if (aTaskFlag[6])
-  {
-    getField('SEND_EMAIL').checked    = (oTaskData.SEND_EMAIL == 'TRUE' ? true : false);
-    getField('TAS_DEF_MESSAGE').value = oTaskData.TAS_DEF_MESSAGE;
-  }
-  else
-  {
-    saveDataTaskTemporal(7);
-    aTaskFlag[6] = true;
-  }
-
   if (@@TAS_SEND_LAST_EMAIL == 'TRUE')
   {
     getField('SEND_EMAIL').checked = true;
@@ -66,31 +54,64 @@
     hideRowById('TAS_DEF_MESSAGE_TEMPLATE');
   }
 
-  leimnud.event.add(getField('SEND_EMAIL'), 'click', function() {
+  /* Recovery data */
-    var oAux = document.getElementById('form[TAS_DEF_MESSAGE]');
+  if (aTaskFlag[6])
-    if (!document.getElementById('form[SEND_EMAIL]').checked)
   {
-      hideRowById('TAS_DEF_SUBJECT_MESSAGE');
+    getField('SEND_EMAIL').checked    = (oTaskData.SEND_EMAIL == 'TRUE' ? true : false);
-      hideRowById('TAS_DEF_MESSAGE');
+    getField('TAS_DEF_MESSAGE').value = oTaskData.TAS_DEF_MESSAGE;
-      hideRowById('TAS_DEF_MESSAGE_TEMPLATE');
+    getField('TAS_DEF_SUBJECT_MESSAGE').value = oTaskData.TAS_DEF_SUBJECT_MESSAGE;
-      hideRowById('TAS_DEF_MESSAGE_TYPE');
+    getField('TAS_DEF_MESSAGE_TYPE').value = oTaskData.TAS_DEF_MESSAGE_TYPE;
+    getField('TAS_DEF_MESSAGE_TEMPLATE').value = oTaskData.TAS_DEF_MESSAGE_TEMPLATE;
+    clickSendEmail();
+
+    if (getField('SEND_EMAIL').checked == true) {
+      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
+        });      
+      } 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() == '') {
+            new leimnud.module.app.alert().make( {
+              label : G_STRINGS.ID_MESSAGE_FIELD_REQUIRED
+            });
+            vmesn.failed();
+          } else {
+            vmesn.passed();
+          }
+          break;
+        case 'template' :
+          var vmesn = new input(getField('TAS_DEF_MESSAGE_TEMPLATE'));
+          if (getField('TAS_DEF_MESSAGE_TEMPLATE').value.trim() == ''){
+            new leimnud.module.app.alert().make( {
+              label : G_STRINGS.ID_TEMPLATE_FIELD_REQUIRED
+            });
+            vmesn.failed();
+          } else {
+            vmesn.passed();
+          }
+          break;
+      }
+    }
   }
   else
   {
-      showRowById('TAS_DEF_SUBJECT_MESSAGE');
+    saveDataTaskTemporal(7);
-      if (getField('TAS_DEF_MESSAGE_TYPE').value == 'template'){
+    aTaskFlag[6] = true;
-        hideRowById('TAS_DEF_MESSAGE');
-        showRowById('TAS_DEF_MESSAGE_TEMPLATE');
-      } else {
-        showRowById('TAS_DEF_MESSAGE');
-        hideRowById('TAS_DEF_MESSAGE_TEMPLATE');
-      }
-      showRowById('TAS_DEF_MESSAGE_TYPE');
   }
+
+  leimnud.event.add(getField('SEND_EMAIL'), 'click', function() {
+    clickSendEmail();
   });
   
   leimnud.event.add(getField('TAS_DEF_MESSAGE_TYPE'), 'change', function() {
-    if (this.value == 'text') {
+    if (getField('TAS_DEF_MESSAGE_TYPE').value == 'text') {
       showRowById('TAS_DEF_MESSAGE');
       hideRowById('TAS_DEF_MESSAGE_TEMPLATE');
     } else {
@@ -99,9 +120,45 @@
     }
   });
 
+  leimnud.event.add(getField('TAS_DEF_SUBJECT_MESSAGE'), 'change', function() {
+    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
+      });
+    } else {
+      fieldEval.passed();
+    }
+  });
+
+  leimnud.event.add(getField('TAS_DEF_MESSAGE'), 'change', function() {
+    var fieldEval = new input(getField('TAS_DEF_MESSAGE'));
+    if (getField('TAS_DEF_MESSAGE').value.trim() == '') {
+      fieldEval.failed();
+      new leimnud.module.app.alert().make( {
+        label : G_STRINGS.ID_MESSAGE_FIELD_REQUIRED
+      });
+    } else {
+      fieldEval.passed();
+    }
+  });
+
+  leimnud.event.add(getField('TAS_DEF_MESSAGE_TEMPLATE'), 'change', function() {
+    var fieldEval = new input(getField('TAS_DEF_MESSAGE_TEMPLATE'));
+    if (getField('TAS_DEF_MESSAGE_TEMPLATE').value.trim() == '') {
+      fieldEval.failed();
+      new leimnud.module.app.alert().make( {
+        label : G_STRINGS.ID_TEMPLATE_FIELD_REQUIRED
+      });
+    } else {
+      fieldEval.passed();
+    }
+  });
+
   var _oVarsPanel_;
   var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol) {
-    if( sProcess == '') {
+    if(sProcess == '') {
       sProcess = @@PRO_UID;
     }
   	_oVarsPanel_ = new leimnud.module.panel();
@@ -154,6 +211,29 @@
   	_oVarsPanel_.remove();
   };
 
+  var clickSendEmail = function() {
+    var oAux = document.getElementById('form[TAS_DEF_MESSAGE]');
+    if (!document.getElementById('form[SEND_EMAIL]').checked)
+    {
+      hideRowById('TAS_DEF_SUBJECT_MESSAGE');
+      hideRowById('TAS_DEF_MESSAGE');
+      hideRowById('TAS_DEF_MESSAGE_TEMPLATE');
+      hideRowById('TAS_DEF_MESSAGE_TYPE');
+    }
+    else
+    {
+      showRowById('TAS_DEF_SUBJECT_MESSAGE');
+      if (getField('TAS_DEF_MESSAGE_TYPE').value == 'template'){
+        hideRowById('TAS_DEF_MESSAGE');
+        showRowById('TAS_DEF_MESSAGE_TEMPLATE');
+      } else {
+        showRowById('TAS_DEF_MESSAGE');
+        hideRowById('TAS_DEF_MESSAGE_TEMPLATE');
+      }
+      showRowById('TAS_DEF_MESSAGE_TYPE');
+    }
+  };
+
   ]]></JS>
 
 </dynaForm>