From b5cfc808500eb85762f37f068593410cd8dabbd0 Mon Sep 17 00:00:00 2001 From: Jenny Date: Wed, 21 Jan 2015 13:12:30 -0400 Subject: [PATCH 1/2] PM-1301 No se graba el movimiento de carpetas. En Home - Documentes no se graba los movimientos de las carpetas. Faltaba una variable que no se estaba seteando cuando el movimiento se realizaba arrastrando carpetas. Se esta seteando dicha variable para solucionar el problema. --- workflow/engine/templates/cases/casesDocuments.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/workflow/engine/templates/cases/casesDocuments.js b/workflow/engine/templates/cases/casesDocuments.js index 46b4422c9..9a272b7c5 100755 --- a/workflow/engine/templates/cases/casesDocuments.js +++ b/workflow/engine/templates/cases/casesDocuments.js @@ -1597,8 +1597,9 @@ function copymove(action) { // alert('Move ' + dropEvent.data.node.id.replace( /_RRR_/g, '/' )+' to // '+ dropEvent.target.id.replace( /_RRR_/g, '/' )); requestParams = getRequestParams(); - requestParams.dir = datastore.directory.substring(0, - datastore.directory.lastIndexOf('/')); + requestParams.copyMove = 'all'; + //requestParams.dir = datastore.directory.substring(0, + // datastore.directory.lastIndexOf('/')); requestParams.new_dir = dropEvent.target.id.replace(/_RRR_/g, '/'); requestParams.new_dir = requestParams.new_dir.replace(/ext_root/g, ''); requestParams.selitems = Array(dropEvent.data.node.id.replace(/_RRR_/g, @@ -1606,6 +1607,8 @@ function copymove(action) { requestParams.confirm = 'true'; requestParams.action = action; handleCallback(requestParams); + requestParams.copyMove = ''; + requestParams.dir = ''; } } // context menus From dbd751038e9c7aeb60e51b118aec076e46b4edfd Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Fri, 23 Jan 2015 11:54:59 -0400 Subject: [PATCH 2/2] IMPROVEMENT PM-1338 Running cases step_mode 'EDIT' & 'VIEW' --- workflow/engine/classes/class.pmDynaform.php | 3 ++- workflow/engine/js/cases/core/cases_Step_Pmdynaform.js | 1 + workflow/engine/methods/cases/cases_Step.php | 2 +- workflow/engine/templates/cases/cases_Step_Pmdynaform.html | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php index 67bdbbe72..3b9be17a4 100644 --- a/workflow/engine/classes/class.pmDynaform.php +++ b/workflow/engine/classes/class.pmDynaform.php @@ -75,7 +75,7 @@ class pmDynaform exit(); } - public function printEdit($pm_run_outside_main_app, $application, $headData) + public function printEdit($pm_run_outside_main_app, $application, $headData, $step_mode = 'EDIT') { ob_clean(); @@ -101,6 +101,7 @@ class pmDynaform $file = str_replace("{DYNAFORMNAME}", $this->record["PRO_UID"] . "_" . $this->record["DYN_UID"], $file); $file = str_replace("{APP_UID}", $application, $file); $file = str_replace("{PRJ_UID}", $this->app_data["PROCESS"], $file); + $file = str_replace("{STEP_MODE}", $step_mode, $file); $file = str_replace("{WORKSPACE}", $this->app_data["SYS_SYS"], $file); $file = str_replace("{credentials}", json_encode($clientToken), $file); echo $file; diff --git a/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js b/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js index aa20b41bd..ababad45f 100644 --- a/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js +++ b/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js @@ -37,6 +37,7 @@ $(window).load(function () { } var data = jsondata; + data.items[0].mode = step_mode.toLowerCase(); window.project = new PMDynaform.core.Project({ data: data, keys: { diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php index 7c524ea8c..0ff76c553 100755 --- a/workflow/engine/methods/cases/cases_Step.php +++ b/workflow/engine/methods/cases/cases_Step.php @@ -264,7 +264,7 @@ try { G::LoadClass('pmDynaform'); $a = new pmDynaform($_GET['UID'], $Fields['APP_DATA']); if ($a->isResponsive()) { - $a->printEdit((!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) ? "true" : "false", $_SESSION['APPLICATION'], $array); + $a->printEdit((!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) ? "true" : "false", $_SESSION['APPLICATION'], $array, $oStep->getStepMode()); } else { $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['UID'], '', $Fields['APP_DATA'], 'cases_SaveData?UID=' . $_GET['UID'] . '&APP_UID=' . $_SESSION['APPLICATION'], '', (strtolower($oStep->getStepMode()) != 'edit' ? strtolower($oStep->getStepMode()) : '')); } diff --git a/workflow/engine/templates/cases/cases_Step_Pmdynaform.html b/workflow/engine/templates/cases/cases_Step_Pmdynaform.html index 1ee6b7148..cae588671 100644 --- a/workflow/engine/templates/cases/cases_Step_Pmdynaform.html +++ b/workflow/engine/templates/cases/cases_Step_Pmdynaform.html @@ -25,6 +25,7 @@ var __DynaformName__ = '{DYNAFORMNAME}'; var app_uid = '{APP_UID}'; var prj_uid = '{PRJ_UID}'; + var step_mode = '{STEP_MODE}'; var workspace = '{WORKSPACE}'; var credentials = {credentials};