fernando/luos
1
0
Fork 0
Code Releases Activity

PM-3720

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2015-10-06 18:02:55 -04:00
parent 3bc6770295
commit 73da254808
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
workflow/engine/controllers/pmTablesProxy.php
View File

@@ -1877,20 +1877,20 @@ class pmTablesProxy extends HttpProxyController
public function getDynaformVariables($sProcessUID,$excludeFieldsList,$allowed = true) public function getDynaformVariables($sProcessUID,$excludeFieldsList,$allowed = true)
{ {
$dynaformVariables = array(); $dynaformVariables = array();
$oC = new Criteria( 'workflow' ); $oC = new Criteria( 'workflow' );
$oC->addSelectColumn( DynaformPeer::DYN_CONTENT ); $oC->addSelectColumn( DynaformPeer::DYN_CONTENT );
$oC->add( DynaformPeer::PRO_UID, $sProcessUID ); $oC->add( DynaformPeer::PRO_UID, $sProcessUID );
$oData = DynaformPeer::doSelectRS( $oC ); $oData = DynaformPeer::doSelectRS( $oC );
$oData->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oData->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oData->next(); $oData->next();
while ($aRowd = $oData->getRow()) { while ($aRowd = $oData->getRow()) {
$dynaform = G::json_decode($aRowd['DYN_CONTENT'],true); $dynaform = G::json_decode($aRowd['DYN_CONTENT'],true);
if(is_array($dynaform) && sizeof($dynaform)) { if(is_array($dynaform) && sizeof($dynaform)) {
$items = $dynaform['items'][0]['items']; $items = $dynaform['items'][0]['items'];
foreach($items as $key => $val){ foreach($items as $key => $val){
foreach($val as $column) { foreach($val as $column) {
if($allowed) { if($allowed) {
if(!in_array( $column['type'], $excludeFieldsList )){ if(isset($column['type']) && !in_array( $column['type'], $excludeFieldsList )){
if(array_key_exists('variable',$column)) { if(array_key_exists('variable',$column)) {
if($column['variable'] != "") { if($column['variable'] != "") {
$dynaformVariables[] = $column['variable']; $dynaformVariables[] = $column['variable'];
@@ -1898,7 +1898,7 @@ class pmTablesProxy extends HttpProxyController
} }
} }
} else { } else {
if(in_array( $column['type'], $excludeFieldsList )){ if(isset($column['type']) && in_array( $column['type'], $excludeFieldsList )){
if(array_key_exists('variable',$column)) { if(array_key_exists('variable',$column)) {
if($column['variable'] != "") { if($column['variable'] != "") {
$dynaformVariables[] = $column['variable']; $dynaformVariables[] = $column['variable'];
@@ -1907,9 +1907,9 @@ class pmTablesProxy extends HttpProxyController
} }
} }
} }
} }
} }
$oData->next(); $oData->next();
} }
return array_unique($dynaformVariables); return array_unique($dynaformVariables);
} }