fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automatic merge with the upstream master branch

Browse Source
This commit is contained in:
Gustavo Cruz
2012-11-29 12:18:58 -04:00
parent f89014c14a 0cc58c934b
commit f55ff5bdae
144 changed files with 6902 additions and 2234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/processes/main.php
View File

@@ -48,7 +48,7 @@ $G_ID_MENU_SELECTED = 'PROCESSES';
$G_ID_SUB_MENU_SELECTED = '-';
$G_PUBLISH = new Publisher();
$oHeadPublisher = & headPublisher::getSingleton();
// $oHeadPublisher = & headPublisher::getSingleton();
//$oHeadPublisher->addScriptFile('/jscore/processes/main.js');
$G_PUBLISH->AddContent( 'view', 'processes/mainLoad' );

4
workflow/engine/methods/processes/mainInit.php
View File

@@ -22,7 +22,8 @@
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
$oHeadPublisher = & headPublisher::getSingleton();
//$oHeadPublisher = & headPublisher::getSingleton();
G::loadClass( 'configuration' );
$conf = new Configurations();
@@ -33,4 +34,3 @@ $oHeadPublisher->addContent( 'processes/main' ); //adding a html file .html.
$oHeadPublisher->assign( 'pageSize', $conf->getEnvSetting( 'casesListRowNumber' ) );
G::RenderPage( 'publish', 'extJs' );

2
workflow/engine/methods/processes/processesList.php
View File

@@ -29,7 +29,7 @@ $limit = isset( $_POST['limit'] ) ? $_POST['limit'] : '';
$oProcess = new Process();
$memcache = & PMmemcached::getSingleton( SYS_SYS );
//$memcache = & PMmemcached::getSingleton( SYS_SYS );
$memkey = 'no memcache';
$memcacheUsed = 'not used';

9
workflow/engine/methods/processes/processes_Ajax.php
View File

@@ -36,13 +36,16 @@ try {
die;
break;
}*/
$oJSON = new Services_JSON();
//$oJSON = new Services_JSON();
if (isset( $_REQUEST['data'] )) {
$oData = $oJSON->decode( stripslashes( $_REQUEST['data'] ) );
$oData = G::json_decode( stripslashes( $_REQUEST['data'] ) );
//$oData = $oJSON->decode( stripslashes( $_REQUEST['data'] ) );
$sOutput = '';
$sTask = '';
}
G::LoadClass( 'processMap' );
//G::LoadClass( 'processMap' );
$oProcessMap = new processMap( new DBConnection() );
switch ($_REQUEST['action']) {