fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of github.com:colosa/processmaker

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2013-10-09 11:19:45 -04:00
parent ac6e6926ea 8c041513c6
commit dbd8ddbb5c
6 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/classes/class.AppSolr.php
View File

@@ -351,6 +351,11 @@ class AppSolr
//$sortableCols [0] = 'true';
$sortDir [0] = $dir;
break;
case 'APP_STATUS' :
$sortCols [0] = 'APP_STATUS'; //6;
//$sortableCols [0] = 'true';
$sortDir [0] = $dir;
break;
case 'APP_UPDATE_DATE' :
$sortCols [0] = 'DEL_LAST_UPDATE_DATE'; //12;
//$sortableCols [0] = 'true';

4
workflow/engine/classes/class.pmScript.php Executable file → Normal file
View File

@@ -575,7 +575,7 @@ function handleFatalErrors ($buffer)
if (preg_match( '/(error<\/b>:)(.+)(<br)/', $buffer, $regs )) {
$err = preg_replace( '/<.*?>/', '', $regs[2] );
$aAux = explode( ' in ', $err );
$sCode = $_SESSION['_CODE_'];
$sCode = isset($_SESSION['_CODE_']) ? $_SESSION['_CODE_'] : null;
unset( $_SESSION['_CODE_'] );
registerError( 2, $aAux[0], 0, $sCode );
if (strpos( $_SERVER['REQUEST_URI'], '/cases/cases_Step' ) !== false) {
@@ -604,7 +604,7 @@ function handleFatalErrors ($buffer)
die();
} else {
$aNextStep = $oCase->getNextStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] );
if ($_SESSION['TRIGGER_DEBUG']['ISSET']) {
if (isset($_SESSION['TRIGGER_DEBUG']['ISSET']) && $_SESSION['TRIGGER_DEBUG']['ISSET']) {
$_SESSION['TRIGGER_DEBUG']['TIME'] = 'AFTER';
$_SESSION['TRIGGER_DEBUG']['BREAKPAGE'] = $aNextStep['PAGE'];
$aNextStep['PAGE'] = $aNextStep['PAGE'] . '&breakpoint=triggerdebug';