From 02b81a15e0779d568173dc9a628993a8d4ee54c9 Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Thu, 24 Feb 2011 23:11:04 +0000 Subject: [PATCH] BUG 6250: solved --- .../engine/methods/cases/casesListExtJsRedirector.php | 4 ++++ workflow/engine/methods/cases/cases_Derivate.php | 7 +++---- workflow/engine/templates/cases/casesDocuments.js | 5 ++--- workflow/engine/templates/cases/casesList.js | 11 ++++------- workflow/engine/templates/cases/casesStartCase.js | 11 ++++------- workflow/engine/templates/cases/casesStartPage.js | 11 ++++------- 6 files changed, 21 insertions(+), 28 deletions(-) create mode 100755 workflow/engine/methods/cases/casesListExtJsRedirector.php diff --git a/workflow/engine/methods/cases/casesListExtJsRedirector.php b/workflow/engine/methods/cases/casesListExtJsRedirector.php new file mode 100755 index 000000000..f8f0ac214 --- /dev/null +++ b/workflow/engine/methods/cases/casesListExtJsRedirector.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/workflow/engine/methods/cases/cases_Derivate.php b/workflow/engine/methods/cases/cases_Derivate.php index 024252d29..83fa4e24b 100644 --- a/workflow/engine/methods/cases/cases_Derivate.php +++ b/workflow/engine/methods/cases/cases_Derivate.php @@ -141,13 +141,12 @@ try { } //Events - End - $aNextStep['PAGE'] = 'casesListExtJs'; + $aNextStep['PAGE'] = 'casesListExtJsRedirector'; if( isset($_SESSION['PMDEBUGGER']) && $_SESSION['PMDEBUGGER'] ){ $_SESSION['TRIGGER_DEBUG']['BREAKPAGE'] = $aNextStep['PAGE']; G::header('location: ' . 'cases_Step?' .'breakpoint=triggerdebug'); - } - else { - G::header('location: casesListExtJs'); + } else { + G::header('location: casesListExtJsRedirector'); } } catch ( Exception $e ){ diff --git a/workflow/engine/templates/cases/casesDocuments.js b/workflow/engine/templates/cases/casesDocuments.js index 3af13e78f..6d6c3c6f5 100644 --- a/workflow/engine/templates/cases/casesDocuments.js +++ b/workflow/engine/templates/cases/casesDocuments.js @@ -1654,9 +1654,8 @@ documentsTab ] // routine to hide the debug panel if it is open if (parent.PANEL_EAST_OPEN) { parent.PANEL_EAST_OPEN = false; - var debugPanel = parent.Ext.getCmp('debugPanel'); - debugPanel.hide(); - debugPanel.ownerCt.doLayout(); + parent.Ext.getCmp('debugPanel').hide(); + parent.Ext.getCmp('debugPanel').ownerCt.doLayout(); } }); \ No newline at end of file diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index f1417e7e3..d6ee5e7e0 100755 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -1407,13 +1407,10 @@ var gridForm = new Ext.FormPanel({ //routine to hide the debug panel if it is open if( typeof parent != 'undefined' ){ - if( typeof parent.parent != 'undefined' ){ - if( parent.parent.PANEL_EAST_OPEN ){ - parent.parent.PANEL_EAST_OPEN = false; - var debugPanel = parent.parent.Ext.getCmp('debugPanel'); - debugPanel.hide(); - debugPanel.ownerCt.doLayout(); - } + if( parent.PANEL_EAST_OPEN ){ + parent.PANEL_EAST_OPEN = false; + parent.Ext.getCmp('debugPanel').hide(); + parent.Ext.getCmp('debugPanel').ownerCt.doLayout(); } } diff --git a/workflow/engine/templates/cases/casesStartCase.js b/workflow/engine/templates/cases/casesStartCase.js index f3fa6fa9a..3ad762b29 100644 --- a/workflow/engine/templates/cases/casesStartCase.js +++ b/workflow/engine/templates/cases/casesStartCase.js @@ -342,13 +342,10 @@ Ext.onReady(function() { //routine to hide the debug panel if it is open if( typeof parent != 'undefined' ){ - if( typeof parent.parent != 'undefined' ){ - if( parent.parent.PANEL_EAST_OPEN ){ - parent.parent.PANEL_EAST_OPEN = false; - var debugPanel = parent.parent.Ext.getCmp('debugPanel'); - debugPanel.hide(); - debugPanel.ownerCt.doLayout(); - } + if( parent.PANEL_EAST_OPEN ){ + parent.PANEL_EAST_OPEN = false; + parent.Ext.getCmp('debugPanel').hide(); + parent.Ext.getCmp('debugPanel').ownerCt.doLayout(); } } diff --git a/workflow/engine/templates/cases/casesStartPage.js b/workflow/engine/templates/cases/casesStartPage.js index 405009c9e..963081a5b 100644 --- a/workflow/engine/templates/cases/casesStartPage.js +++ b/workflow/engine/templates/cases/casesStartPage.js @@ -284,13 +284,10 @@ Ext.onReady(function() { //routine to hide the debug panel if it is open if( typeof parent != 'undefined' ){ - if( typeof parent.parent != 'undefined' ){ - if( parent.parent.PANEL_EAST_OPEN ){ - parent.parent.PANEL_EAST_OPEN = false; - var debugPanel = parent.parent.Ext.getCmp('debugPanel'); - debugPanel.hide(); - debugPanel.ownerCt.doLayout(); - } + if( parent.PANEL_EAST_OPEN ){ + parent.PANEL_EAST_OPEN = false; + parent.Ext.getCmp('debugPanel').hide(); + parent.Ext.getCmp('debugPanel').ownerCt.doLayout(); } }