Merge pull request #51 from brayanpereyra/BUG-8933

BUG 8933 The code Javascrit don't mix with PHP SOLVED

workflow/engine/classes/class.dynaformEditor.php

@@ -265,6 +265,7 @@ class dynaformEditor extends WebResource
     var DYNAFORM_URL="'.$Parameters['URL'].'";
     leimnud.event.add(window,"load",function(){ loadEditor(); });
     ');
+    $oHeadPublisher->addScriptCode(' var jsMeta;');
     G::RenderPage( "publish", 'blank' );
   }
 
@@ -664,8 +665,12 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
    * @param string $sCode
    * @return array
    */
-  function set_javascript($A,$fieldName,$sCode)
+  function set_javascript($A,$fieldName,$sCode,$meta)
   {
+    if ($fieldName == '___pm_boot_strap___') {
+      return 0;
+    }
+    
     $sCode = urldecode($sCode) ;
     try {
       $sCode = rtrim($sCode);
@@ -678,7 +683,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
       G::LoadSystem('dynaformhandler');
 
 		  $dynaform = new dynaFormHandler(PATH_DYNAFORM."{$file}.xml");
-      $dynaform->replace($fieldName, $fieldName, Array('type'=>'javascript', '#cdata'=>$sCode));
+      $dynaform->replace($fieldName, $fieldName, Array('type'=>'javascript', 'meta'=>$meta, '#cdata'=>$sCode));
 
       return 0;
     } catch(Exception $e) {

workflow/engine/js/dynaformEditor/core/dynaformEditor.js

@@ -165,10 +165,11 @@ var dynaformEditor={
   {
     var field=getField("JS_LIST","dynaforms_JSEditor");
     var code=this.getJSCode();
-    
+    var meta=jsMeta;
+
     if (field.value)
     {
-      var res = this.ajax.set_javascript(this.A,field.value, encodeURIComponent(code));
+      var res = this.ajax.set_javascript(this.A,field.value, encodeURIComponent(code), meta);
       if (typeof(res["*message"])==="string")
       {
         G.alert(res["*message"]);
@@ -462,7 +463,7 @@ var dynaformEditor={
       if( field.options[j].value == '___pm_boot_strap___' ){
         field.remove(j);
       }
-    }
+    }    
     this.currentJS=field.value;
     var res=this.ajax.get_javascripts(this.A,field.value);
     if(field.value == ''){

workflow/engine/js/dynaforms/dynaforms_fieldsHandler.js

@@ -90,9 +90,11 @@
 			 //alert( "Data Saved: " + httpResponse );
 		   }
 		});
+		fieldsHandlerSaveHidden();
 	}
 	
 	function fieldsHandlerSaveHidden(){
+		var responseMeta;
         e = $('input:checkbox');
         hidden_elements = '';
         for(i=0; i<e.length; i++){
@@ -105,11 +107,14 @@
 		$.ajax({
 		   type: "POST",
 		   url: "fieldsHandlerAjax",
+		   async: false,
 		   data: "request=saveHidden&hidden="+hidden_elements,
 		   success: function(httpResponse){
-			 //alert( "Data Saved: " + httpResponse );
+			 	responseMeta = httpResponse;
-		   }
+			 }
-		});		
+		});
+		return responseMeta;
+
 	}
 
 	function backImage(oImg,p){

workflow/engine/methods/dynaforms/dynaforms_Editor.php

@@ -90,4 +90,4 @@ if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Respons
   $editor->_setUseTemporalCopy(true);
   $editor->_render();
 
-?>
+?>

workflow/engine/methods/dynaforms/fieldsHandlerAjax.php

@@ -88,8 +88,9 @@
 				if( $o->nodeExists('___pm_boot_strap___') ){	
 					$o->remove('___pm_boot_strap___');
 				}
-				$o->add('___pm_boot_strap___', Array('type'=>'javascript', "meta"=>G::encrypt($hidden_items_tmp, 'dynafieldsHandler')), "/*$msg*/ $hStr");
+				$metaEncrypt = G::encrypt($hidden_items_tmp, 'dynafieldsHandler');
-				
+				$o->add('___pm_boot_strap___', Array('type'=>'javascript', "meta"=>$metaEncrypt), "/*$msg*/ $hStr");
+				echo $metaEncrypt;
 			} else { //we must to remove the boot strap node;
 				$o->remove('___pm_boot_strap___');
 			}

workflow/engine/templates/dynaforms/fieldsHandler.php

@@ -69,11 +69,17 @@
 	
 	foreach($elements as $node_name=>$node){
 		if( $node_name == "___pm_boot_strap___"){
-			$boot_strap = $elements[$node_name];
+      $boot_strap = $elements[$node_name];
 			$hidden_fields = G::decrypt($boot_strap['__ATTRIBUTES__']['meta'], 'dynafieldsHandler');
 			//echo $hidden_fields;
 			$hidden_fields_list = explode(',', $hidden_fields);
 			unset($elements[$node_name]);
+
+      ?>
+      <script>
+        parent.jsMeta = "<? echo $boot_strap['__ATTRIBUTES__']['meta'] ?>";
+      </script>
+      <?php
 		}
 	} 
 ?>
@@ -112,7 +118,7 @@
 				<tr>
 					<td width="7%">
 						<?php if($node['__ATTRIBUTES__']['type'] != 'javascript' && $dynaformType != 'grid') {?>
-						<input id="chk@<?php echo $node_name?>" type="checkbox" onclick="fieldsHandlerSaveHidden()" <?php echo $checked?> />
+						<input id="chk@<?php echo $node_name?>" type="checkbox" onclick="parent.jsMeta = fieldsHandlerSaveHidden();" <?php echo $checked?> />
 						<?php } else {?>
 						&nbsp;
 						<?php }?>