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

Adding fix for session loose at time to load inexistent png file.

Browse Source
This commit is contained in:
ralph
2012-12-11 15:10:02 -04:00
parent 3d5d129c6b
commit 274add8cbf
5 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/model/AppDelegationPeer.php
View File

@@ -25,10 +25,10 @@
*/ */
// include base peer class // include base peer class
require_once 'classes/model/om/BaseAppDelegationPeer.php'; //require_once 'classes/model/om/BaseAppDelegationPeer.php';
// include object class // include object class
include_once 'classes/model/AppDelegation.php'; //include_once 'classes/model/AppDelegation.php';
/** /**

2
workflow/engine/classes/model/om/BaseAppNotesPeer.php
View File

@@ -3,7 +3,7 @@
require_once 'propel/util/BasePeer.php'; require_once 'propel/util/BasePeer.php';
// The object class -- needed for instanceof checks in this class. // The object class -- needed for instanceof checks in this class.
// actual class may be a subclass -- as returned by AppNotesPeer::getOMClass() // actual class may be a subclass -- as returned by AppNotesPeer::getOMClass()
include_once 'classes/model/AppNotes.php'; //include_once 'classes/model/AppNotes.php';
/** /**
* Base static class for performing query and update operations on the 'APP_NOTES' table. * Base static class for performing query and update operations on the 'APP_NOTES' table.

27
workflow/engine/controllers/appProxy.php
View File

@@ -38,12 +38,25 @@ class AppProxy extends HttpProxyController
if (!isset($_SESSION['PROCESS']) && !isset($httpData->pro)) { if (!isset($_SESSION['PROCESS']) && !isset($httpData->pro)) {
$caseLoad = $case->loadCase($appUid); $caseLoad = $case->loadCase($appUid);
$httpData->pro = $caseLoad['PRO_UID']; $httpData->pro = $caseLoad['PRO_UID'];
}
if(!isset($httpData->pro) || empty($httpData->pro) )
{
$proUid = $_SESSION['PROCESS'];
} else {
$proUid = $httpData->pro;
} }
$proUid = (!isset($httpData->pro)) ? $_SESSION['PROCESS'] : $httpData->pro; if(!isset($httpData->tas) || empty($httpData->tas))
$tasUid = (!isset($httpData->tas)) ? ((isset($_SESSION['TASK'])) ? $_SESSION['TASK'] : '') : $httpData->tas; {
$tasUid = $_SESSION['TASK'];
} else {
$tasUid = $httpData->tas;
}
//$proUid = (!isset($httpData->pro)) ? $_SESSION['PROCESS'] : $httpData->pro;
//$tasUid = (!isset($httpData->tas)) ? ((isset($_SESSION['TASK'])) ? $_SESSION['TASK'] : '') : $httpData->tas;
$usrUid = $_SESSION['USER_LOGGED']; $usrUid = $_SESSION['USER_LOGGED'];
$respView = $case->getAllObjectsFrom( $proUid, $appUid, $tasUid, $usrUid, 'VIEW' ); $respView = $case->getAllObjectsFrom( $proUid, $appUid, $tasUid, $usrUid, 'VIEW' );
$respBlock = $case->getAllObjectsFrom( $proUid, $appUid, $tasUid, $usrUid, 'BLOCK' ); $respBlock = $case->getAllObjectsFrom( $proUid, $appUid, $tasUid, $usrUid, 'BLOCK' );
@@ -52,7 +65,7 @@ class AppProxy extends HttpProxyController
); );
} }
require_once ("classes/model/AppNotes.php"); //require_once ("classes/model/AppNotes.php");
if (! isset( $appUid )) { if (! isset( $appUid )) {
throw new Exception( 'Can\'t resolve the Apllication ID for this request.' ); throw new Exception( 'Can\'t resolve the Apllication ID for this request.' );
@@ -73,7 +86,7 @@ class AppProxy extends HttpProxyController
*/ */
function postNote ($httpData) function postNote ($httpData)
{ {
require_once ("classes/model/AppNotes.php"); //require_once ("classes/model/AppNotes.php");
//extract(getExtJSParams()); //extract(getExtJSParams());
if (isset( $httpData->appUid ) && trim( $httpData->appUid ) != "") { if (isset( $httpData->appUid ) && trim( $httpData->appUid ) != "") {
@@ -91,7 +104,7 @@ class AppProxy extends HttpProxyController
//Disabling the controller response because we handle a special behavior //Disabling the controller response because we handle a special behavior
$this->setSendResponse(false); $this->setSendResponse(false);
//Add note case //Add note case
$appNote = new AppNotes(); $appNote = new AppNotes();
$response = $appNote->addCaseNote($appUid, $usrUid, $noteContent, intval($httpData->swSendMail)); $response = $appNote->addCaseNote($appUid, $usrUid, $noteContent, intval($httpData->swSendMail));

2
workflow/engine/templates/app/main.js
View File

@@ -221,7 +221,7 @@ function openCaseNotesWindow(appUid1, modalSw, appTitle, proUid, taskUid)
text: _('ID_CANCEL'), text: _('ID_CANCEL'),
cls: 'x-toolbar1', cls: 'x-toolbar1',
//iconCls: 'xx', //iconCls: 'xx',
icon: '/images/add_notes.png', //icon: '/images/add_notes.png',
handler: newNoteHandler, handler: newNoteHandler,
tooltip: { tooltip: {
title: _('ID_CASES_NOTES_ADD'), title: _('ID_CASES_NOTES_ADD'),

1
workflow/public_html/sysGeneric.php
View File

@@ -448,6 +448,7 @@ Bootstrap::registerClass('Task', PATH_HOME . "engine/classes/model
Bootstrap::registerClass('TaskPeer', PATH_HOME . "engine/classes/model/TaskPeer.php"); Bootstrap::registerClass('TaskPeer', PATH_HOME . "engine/classes/model/TaskPeer.php");
Bootstrap::registerClass('dates', PATH_HOME . "engine/classes/class.dates.php"); Bootstrap::registerClass('dates', PATH_HOME . "engine/classes/class.dates.php");
Bootstrap::registerClass('AppDelegation', PATH_HOME . "engine/classes/model/AppDelegation.php"); Bootstrap::registerClass('AppDelegation', PATH_HOME . "engine/classes/model/AppDelegation.php");
Bootstrap::registerClass('BaseAppDelegationPeer',PATH_HOME . "engine/classes/model/om/BaseAppDelegationPeer.php");
Bootstrap::registerClass('AppDelegationPeer', PATH_HOME . "engine/classes/model/AppDelegationPeer.php"); Bootstrap::registerClass('AppDelegationPeer', PATH_HOME . "engine/classes/model/AppDelegationPeer.php");
Bootstrap::registerClass('BaseAppDelay', PATH_HOME . "engine/classes/model/om/BaseAppDelay.php"); Bootstrap::registerClass('BaseAppDelay', PATH_HOME . "engine/classes/model/om/BaseAppDelay.php");
Bootstrap::registerClass('AppDelayPeer', PATH_HOME . "engine/classes/model/AppDelayPeer.php"); Bootstrap::registerClass('AppDelayPeer', PATH_HOME . "engine/classes/model/AppDelayPeer.php");