BUG 9554 Event setup has a different way to pick Variables ... SOLVED

- The Events->Action call other control "picker" because don't need the key cast description and the System variables
- Changed the appereance and behaviour of the control "picker" in the Event->Action panel

workflow/engine/classes/class.processMap.php

@@ -371,7 +371,9 @@ class processMap {
 	      $oPM->taskOptions[]=$taskOption;
       }
 
-      $oJSON = new Services_JSON ( );
+      $_SESSION['PROCESS'] = $sProcessUID;
+
+      $oJSON = new Services_JSON();
       return $oJSON->encode($oPM);
     } catch (Exception $oError) {
       throw ($oError);

workflow/engine/js/events/events.js

@@ -146,7 +146,7 @@ var EventCompose = function(t){
 
 		oPanel = new leimnud.module.panel();
 		oPanel.options = {
-		  	size	:{w:350,h:310},
+		  	size	:{w:450,h:400},
 		  	position:{x:e.clientX,y:e.clientY,center:false},
 		  	title	:'',
 		  	theme	:"processmaker",

workflow/engine/methods/events/eventsAjax.php

@@ -69,36 +69,17 @@ switch($req){
 	break;
 
 	case 'showDynavars':
-		G::LoadClass('processMap');
+        G::LoadClass('xmlfield_InputPM');
-		$oProcessMap = new processMap();
+        $dynaformFields = getDynaformsVars($_SESSION['PROCESS'], false, false);
-		$aDynaforms = $oProcessMap->getDynaformsList($_SESSION['PROCESS']);
+        $fields = array(array('id' => 'char', 'dynaform' => 'char', 'name' => 'char'));
-		//g::pr($aDynaforms);
-		G::LoadSystem('dynaformhandler');
-		$aDynaformFields = Array();
-		foreach($aDynaforms as $dyn){
-			if( $dyn['DYN_TYPE'] == 'xmlform' ){
-        if( is_file(PATH_DYNAFORM . "{$_SESSION['PROCESS']}/{$dyn['DYN_UID']}" . '.xml') ){
-		        $oDynaformHandler = new dynaFormHandler(PATH_DYNAFORM . "{$_SESSION['PROCESS']}/{$dyn['DYN_UID']}" . '.xml');
-		        $aDynaformFields[$dyn['DYN_TITLE']] =  $oDynaformHandler->getFieldNames();
 
-        } else {
+        foreach ($dynaformFields as $dynaformField) {
-          continue;
+            $fields[] = array('id' => $dynaformField['sName'],
+                              'name' => '<a href="#" style="color: black;" onclick="e.toAdd(\'' . $dynaformField['sName'] . '\', \'' . $dynaformField['sName'] . '\', \'dyn\');oPanel.remove();return false;">@#' . $dynaformField['sName'] . '</a>', 'label' => $dynaformField['sLabel']);
         }
-			}
-		}
 
-		
-		//G::pr($aDynaformFields); die;
-		$aRows = Array();
-		$aRows[0] = Array('id'=>'char', 'dynaform'=>'char', 'name'=>'char');
-		foreach($aDynaformFields as $dynName=>$aFields){
-			foreach($aFields as $sField){
-				array_push($aRows, Array('id'=>$sField, 'dynaform'=>$dynName, 'name'=>$sField));
-			}
-		}
-		//g::pr($aRows); die;
 		global $_DBArray;
-		$_DBArray['virtualtable'] = $aRows;
+		$_DBArray['virtualtable'] = $fields;
 		$_SESSION['_DBArray'] = $_DBArray;
 		G::LoadClass('ArrayPeer');
 		$oCriteria = new Criteria('dbarray');
@@ -107,6 +88,5 @@ switch($req){
 		$G_PUBLISH = new Publisher();
 		$G_PUBLISH->AddContent('propeltable', 'paged-table', 'events/dynavarsList', $oCriteria);
 		G::RenderPage('publish', 'raw');
-		
 	break;
 }

workflow/engine/xmlform/events/dynavarsList.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dynaForm width="100%" rowsPerPage="5">
+<dynaForm width="450" rowsPerPage="10">
   <id type="private" showInTable="0"/>
-  <name type="text" width="350" titleAlign="left" align="left">
+  <name type="text" width="200" titleAlign="left" align="left" enableHtml="1">
-    <en>Var. name</en>
+    <en>Variable</en>
   </name>
-  <dynaform type="text" colWidth="350" titleAlign="left" align="left">
+  <label type="text" width="250" titleAlign="left" align="left">
-    <en>Dynaform</en>
+    <en>Label</en>
-  </dynaform>
+  </label>
-  <ASSIGN type="link" colWidth="40" value="@G::LoadTranslation(ID_ASSIGN)" link="#" onclick="e.toAdd(@qid, @qname, &#039;dyn&#039;);return false;"/>
 </dynaForm>