fernando/luos
1
0
Fork 0
Code Releases Activity

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

Browse Source 
- 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
This commit is contained in:
Julio Cesar Laura
2012-08-14 10:58:44 -04:00
parent 49b4279a7f
commit 5be45bfc7a
4 changed files with 57 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
workflow/engine/methods/events/eventsAjax.php
View File

@@ -1,10 +1,10 @@
<?php
<?php
$req = $_POST['request'];
switch($req){
case 'showUsers':
/*
/*
$sql = "SELECT USR_UID, USR_EMAIL, CONCAT(USR_FIRSTNAME, ' ' , USR_LASTNAME) AS USR_FULLNAME FROM USERS WHERE USR_STATUS = 'ACTIVE' AND USR_EMAIL <> ''";
*/
$sDataBase = 'database_' . strtolower(DB_ADAPTER);
@@ -13,11 +13,11 @@ switch($req){
$oDataBase = new database();
$sConcat = $oDataBase->concatString("USR_FIRSTNAME", "' '" , "USR_LASTNAME") ;
}
$sql = " SELECT USR_UID, USR_EMAIL, " .
$sql = " SELECT USR_UID, USR_EMAIL, " .
$sConcat .
" AS USR_FULLNAME FROM USERS " .
" WHERE USR_STATUS = 'ACTIVE' AND USR_EMAIL <> ''";
$oCriteria = new Criteria('workflow');
$del = DBAdapter::getStringDelimiter();
@@ -30,7 +30,7 @@ switch($req){
$aRows[] = array('USR_UID'=>$rs->getString('USR_UID'), 'USR_EMAIL'=>$rs->getString('USR_EMAIL'), 'USR_FULLNAME'=>$rs->getString('USR_FULLNAME'));
}
//echo '<pre>'; print_r($aRows);
global $_DBArray;
$_DBArray['virtualtable'] = $aRows;
$_SESSION['_DBArray'] = $_DBArray;
@@ -42,20 +42,20 @@ switch($req){
$G_PUBLISH->AddContent('propeltable', 'paged-table', 'events/usermailList', $oCriteria);
G::RenderPage('publish', 'raw');
break;
case 'showGroups':
G::LoadClass('groups');
$groups = new Groups();
$allGroups= $groups->getAllGroups();
$aRows[] = array('GRP_UID' => 'char', 'GROUP_TITLE' => 'char');
foreach($allGroups as $group) {
$UID = htmlentities($group->getGrpUid());
$GROUP_TITLE = strip_tags($group->getGrpTitle());
$aRows[] = array('GRP_UID'=>$UID, 'GROUP_TITLE'=>$GROUP_TITLE);
}
global $_DBArray;
$_DBArray['virtualtable'] = $aRows;
$_SESSION['_DBArray'] = $_DBArray;
@@ -67,38 +67,19 @@ switch($req){
$G_PUBLISH->AddContent('propeltable', 'paged-table', 'events/groupmailList', $oCriteria);
G::RenderPage('publish', 'raw');
break;
case 'showDynavars':
G::LoadClass('processMap');
$oProcessMap = new processMap();
$aDynaforms = $oProcessMap->getDynaformsList($_SESSION['PROCESS']);
//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 {
continue;
G::LoadClass('xmlfield_InputPM');
$dynaformFields = getDynaformsVars($_SESSION['PROCESS'], false, false);
$fields = array(array('id' => 'char', 'dynaform' => 'char', 'name' => 'char'));
foreach ($dynaformFields as $dynaformField) {
$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;
}
}