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';

2
workflow/engine/methods/cases/cases_SaveData.php Executable file → Normal file
View File

@@ -56,7 +56,7 @@ try {
$Fields["APP_DATA"] = array_merge( $Fields["APP_DATA"], $_POST["form"] );
#here we must verify if is a debug session
$trigger_debug_session = $_SESSION['TRIGGER_DEBUG']['ISSET']; #here we must verify if is a debugg session
$trigger_debug_session = isset($_SESSION['TRIGGER_DEBUG']['ISSET']) ? $_SESSION['TRIGGER_DEBUG']['ISSET'] : null; #here we must verify if is a debugg session
#trigger debug routines...

10
workflow/engine/skinEngine/simplified/templates/applications.html
View File

@@ -3,15 +3,15 @@
<span class="commentnumber">
#{$APP.APP_NUMBER}
</span>
<span id="n_{$APP.APP_UID}" class="notes-link" style="display:{if $APP.NOTES_COUNT neq 0}block{else}none{/if}">
<a href="#" onclick="showNt('{$APP.APP_UID}'); return false;"><img src="/images/simplified/messages-grey.png" height="20" width="20" border="0"></a>
</span>
<span class="notes-plus-link">
<a href="#" onclick="addNt('{$APP.APP_UID}', '{$APP.PRO_UID}', '{$APP.TAS_UID}'); return false;"><img src="/images/simplified/messages-grey-plus.png" height="21" width="21" border="0"></a>
</span>
<p>
<cite>
<a href="../cases/cases_Open?APP_UID={$APP.APP_UID}&DEL_INDEX={$APP.DEL_INDEX}&action=todo">{$APP.APP_TITLE}</a>
@@ -19,13 +19,13 @@
</p>
<p class="time">
{if $APP.APP_DEL_PREVIOUS_USER != ''}
From {$APP.APP_DEL_PREVIOUS_USER}, send at
{translate label="ID_FROM"} {$APP.APP_DEL_PREVIOUS_USER}, {translate label="ID_SEND_AT"}
{/if}
{$APP.DEL_DELEGATE_DATE}
</p>
<p>{$APP.APP_PRO_TITLE}
<br/>{$APP.APP_TAS_TITLE}</p>
<div id="m_{$APP.APP_UID}" class="appMessages">
{if $APP.NOTES_COUNT neq 0}
{foreach from=$APP.NOTES_LIST key=k item=NOTE}

2
workflow/engine/templates/home/appList.html
View File

@@ -152,7 +152,7 @@
$('#loadmorebutton').html( {/literal}"{translate label="ID_LOAD_MORE"}"{literal} );
}
else {
$('#loadmorebutton').replaceWith(<center>{/literal}"{translate label="ID_NO_MORE_APPLICATIONS"}"{literal}</center>);
$('#loadmorebutton').replaceWith({/literal}"{translate label="ID_NO_MORE_APPLICATIONS"}"{literal});
}
}
});

2
workflow/engine/templates/home/applications.html
View File

@@ -19,7 +19,7 @@
</p>
<p class="time">
{if $APP.APP_DEL_PREVIOUS_USER != ''}
From {$APP.APP_DEL_PREVIOUS_USER}, send at
{translate label="ID_FROM"} {$APP.APP_DEL_PREVIOUS_USER}, {translate label="ID_SEND_AT"}
{/if}
{$APP.DEL_DELEGATE_DATE}
</p>