From 7f1c94897391f74890be08a6092e6bcca55db1d1 Mon Sep 17 00:00:00 2001 From: norahmollo Date: Mon, 10 Nov 2014 08:51:48 -0400 Subject: [PATCH 1/3] PM-697 Workspace restore Workspace restore with overwrite option --- workflow/engine/classes/class.wsTools.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index 5f27d5d4d..94280fbc3 100755 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -1496,9 +1496,8 @@ class workspaceTools if ($workspace->workspaceExists()) { - if ($overwrite) { - $overwriteSite = new workspaceTools($dstWorkspace); - if ($overwriteSite->dbInfo['DB_NAME'] == $overwriteSite->dbInfo['DB_RBAC_NAME']) { + if ($overwrite) { + if ($workspace->dbInfo['DB_NAME'] == $workspace->dbInfo['DB_RBAC_NAME']) { $newDatabases = 1; } else { $newDatabases = 3; From 9b77cb04c0e359a524ee4250e1a97ab3c74bf6ff Mon Sep 17 00:00:00 2001 From: norahmollo Date: Mon, 10 Nov 2014 14:23:43 -0400 Subject: [PATCH 2/3] PM-756 Cases Summary El tab por defecto More information. --- workflow/engine/templates/app/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/templates/app/main.js b/workflow/engine/templates/app/main.js index add2607f1..49b078607 100644 --- a/workflow/engine/templates/app/main.js +++ b/workflow/engine/templates/app/main.js @@ -522,7 +522,6 @@ var openSummaryWindow = function(appUid, delIndex, action) } }; - tabs.push(sumaryInfPanel); if (response.dynUid != '') { if (isMovil.any()) { var src = '../cases/summary?APP_UID=' + appUid + '&DEL_INDEX=' + delIndex + '&DYN_UID=' + response.dynUid; @@ -590,6 +589,7 @@ var openSummaryWindow = function(appUid, delIndex, action) }}); } } + tabs.push(sumaryInfPanel); tabs.push({title: Ext.util.Format.capitalize(_('ID_UPLOADED_DOCUMENTS')), bodyCfg: { tag: 'iframe', id: 'summaryIFrame', From 6d5b6c3393f6f07c86c55218238ba37cde492b89 Mon Sep 17 00:00:00 2001 From: norahmollo Date: Mon, 10 Nov 2014 15:23:15 -0400 Subject: [PATCH 3/3] PM-756 Cases Summary More Information debe estar seleccionada por defecto --- workflow/engine/templates/app/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow/engine/templates/app/main.js b/workflow/engine/templates/app/main.js index 49b078607..6a03efda2 100644 --- a/workflow/engine/templates/app/main.js +++ b/workflow/engine/templates/app/main.js @@ -590,6 +590,7 @@ var openSummaryWindow = function(appUid, delIndex, action) } } tabs.push(sumaryInfPanel); + tabs.push({title: Ext.util.Format.capitalize(_('ID_UPLOADED_DOCUMENTS')), bodyCfg: { tag: 'iframe', id: 'summaryIFrame',