From f2452cd4f28c4e60631131d9043c7fb124bf2761 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Tue, 5 Feb 2013 15:00:07 -0400 Subject: [PATCH 1/2] Improvement the list advanced Search --- workflow/engine/templates/cases/casesList.js | 10 +++---- workflow/engine/templates/cases/main.js | 28 +++++++++++--------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index 12d9f7eeb..ec54de6e4 100644 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -149,7 +149,7 @@ function deleteCase() { url: 'cases_Delete', success: function(response) { try { - parent.updateCasesView(); + parent.updateCasesView(true); } catch (e) { // Nothing to do @@ -236,7 +236,7 @@ function pauseCase(date){ url: 'cases_Ajax', success: function(response) { try { - parent.updateCasesView(); + parent.updateCasesView(true); } catch (e) { // Nothing to do @@ -302,7 +302,7 @@ function cancelCase(){ url: 'cases_Ajax', success: function(response) { try { - parent.updateCasesView(); + parent.updateCasesView(true); } catch (e) { // Nothing to do @@ -340,7 +340,7 @@ function callbackUnpauseCase (btn, text) { url: 'cases_Ajax', success: function(response) { try { - parent.updateCasesView(); + parent.updateCasesView(true); } catch (e) { // Nothing to do @@ -370,7 +370,7 @@ function unpauseCase() { url: 'cases_Ajax', success: function(response) { try { - parent.updateCasesView(); + parent.updateCasesView(true); } catch (e) { // Nothing to do diff --git a/workflow/engine/templates/cases/main.js b/workflow/engine/templates/cases/main.js index 77bc6e32e..2faa46020 100755 --- a/workflow/engine/templates/cases/main.js +++ b/workflow/engine/templates/cases/main.js @@ -532,20 +532,24 @@ Ext.onReady(function(){ setTimeout("timer()", parseInt(FORMATS.casesListRefreshTime) * 1000); }); -function updateCasesView() { +function updateCasesView(view) { try{ if (document.getElementById('casesSubFrame').contentWindow.storeCases) { - switch (document.getElementById('casesSubFrame').contentWindow.storeCases.baseParams.action) { - case "todo": - case "unassigned": - case "paused": - case "to_revise": - case "to_reassign": - document.getElementById('casesSubFrame').contentWindow.storeCases.reload(); - break; - default: - break; - } + if (view) { + document.getElementById('casesSubFrame').contentWindow.storeCases.reload(); + } else { + switch (document.getElementById('casesSubFrame').contentWindow.storeCases.baseParams.action) { + case "todo": + case "unassigned": + case "paused": + case "to_revise": + case "to_reassign": + document.getElementById('casesSubFrame').contentWindow.storeCases.reload(); + break; + default: + break; + } + } } } catch(e){}; From 3d974cc1e223aa83c10a181a2bbbe25d67b2f102 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Tue, 5 Feb 2013 15:20:22 -0400 Subject: [PATCH 2/2] Improvement the list advanced Search --- workflow/engine/templates/cases/main.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/workflow/engine/templates/cases/main.js b/workflow/engine/templates/cases/main.js index 2faa46020..5aca56529 100755 --- a/workflow/engine/templates/cases/main.js +++ b/workflow/engine/templates/cases/main.js @@ -532,10 +532,11 @@ Ext.onReady(function(){ setTimeout("timer()", parseInt(FORMATS.casesListRefreshTime) * 1000); }); -function updateCasesView(view) { +function updateCasesView(viewList) { + var refreshList = viewList || false; try{ if (document.getElementById('casesSubFrame').contentWindow.storeCases) { - if (view) { + if (refreshList) { document.getElementById('casesSubFrame').contentWindow.storeCases.reload(); } else { switch (document.getElementById('casesSubFrame').contentWindow.storeCases.baseParams.action) {