fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 6593 6284 6607 6574 6338 5457 SOLVED. Related to masks and grids

Browse Source
This commit is contained in:
Enrique Ponce De Leon
2011-04-05 19:04:32 -04:00
parent ef969ff36f
commit 29d065f9f1
8 changed files with 2106 additions and 1902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/methods/cases/casesStartPage_Ajax.php
View File

@@ -216,9 +216,6 @@ function startCase() {
if (isset ( $_SESSION ['TASK'] )) unset ( $_SESSION ['TASK'] );
if (isset ( $_SESSION ['INDEX'] )) unset ( $_SESSION ['INDEX'] );
if (isset ( $_SESSION ['STEP_POSITION'] )) unset ( $_SESSION ['STEP_POSITION'] );
if (isset ( $_SESSION ['START_NEW_CASE'] )) unset ( $_SESSION ['START_NEW_CASE'] );
//echo 'Start new case<br />';
/* Process */
try {
@@ -244,8 +241,6 @@ function startCase() {
$_SESSION ['BREAKSTEP'] ['NEXT_STEP'] = $aNextStep;
$aData ['openCase'] = $aNextStep;
$aData ['NewDynaform'] = true; //Sets New Dynaform value
$aData ['status'] = 'success';
print (G::json_encode ( $aData )) ;
}

7
workflow/engine/methods/cases/cases_Open.php
View File

@@ -42,9 +42,6 @@ if( $RBAC->userCanAccess('PM_CASES') != 1 ) {
require_once 'classes/model/AppDelay.php';
G::LoadClass('case');
//Clean NEW_CASE session variable if case isn't new.
if ($_GET['new']!='yes') $_SESSION['NEW_CASE'] = '';
$oCase = new Cases();
//cleaning the case session data
@@ -79,6 +76,8 @@ try {
//loading application data
$aFields = $oCase->loadCase($sAppUid, $iDelIndex);
// g::pr($aFields);
// die;
switch($aFields['APP_STATUS']){
case 'DRAFT':
@@ -168,8 +167,8 @@ try {
unset($_SESSION['bNoShowSteps']);
$aNextStep = $oCase->getNextStep($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION']);
$sPage = $aNextStep['PAGE'];
G::header('location: ' . $sPage);
} else {
//when the case have another user or current user doesnt have rights to this selfservice,

9
workflow/engine/methods/cases/open.php
View File

@@ -46,15 +46,6 @@
if( isset($_GET['APP_UID']) && isset($_GET['DEL_INDEX'])) {
$case = $oCase->loadCase($_GET['APP_UID'], $_GET['DEL_INDEX']);
$appNum = $case['APP_TITLE'];
//Sets NEW_CASE session variable when we're starting a new case
if (isset($_GET['new'])){
if ($_GET['new']=='yes'){
$_SESSION['NEW_CASE'] = 'New';
}else{
$_SESSION['NEW_CASE'] = '';
}
}
}
if (!isset($_GET['to_revise'])){

4
workflow/engine/templates/cases/casesStartCase.js
View File

@@ -321,11 +321,7 @@ function openCaseA(n){
var res = Ext.util.JSON.decode(response.responseText);
if (res.openCase) {
if (res.NewDynaform){
window.location = res.openCase.PAGE + '&new=yes';
}else{
window.location = res.openCase.PAGE;
}
} else {
Ext.Msg.show({
title : TRANSLATIONS.ID_ERROR_CREATING_NEW_CASE, // 'Error creating a new Case',