From 2be74450d2f41489c61ab43d52f8b5993d72d8d9 Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Mon, 3 Sep 2012 16:23:37 -0400 Subject: [PATCH] BUG 9677 "No se lista el Report Table importado dentro del..." SOLVED - When importing a ReportTable in a process, not shown in the list of ReportTables - Problem solved, the PRO_UID variable is created with the UID of the process, when the user is in the ProcessMap * Available from version 2.0.44 --- workflow/engine/controllers/pmTablesProxy.php | 10 ++++++++-- workflow/engine/templates/pmTables/list.js | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php index dfdd82a7c..dd608b4b8 100755 --- a/workflow/engine/controllers/pmTablesProxy.php +++ b/workflow/engine/controllers/pmTablesProxy.php @@ -840,7 +840,13 @@ class pmTablesProxy extends HttpProxyController $tableData->REP_TAB_NAME = $contentSchema['ADD_TAB_NAME']; $tableData->REP_TAB_DSC = $contentSchema['ADD_TAB_DESCRIPTION']; $tableData->REP_TAB_CONNECTION = $contentSchema['DBS_UID']; - $tableData->PRO_UID = isset($contentSchema['PRO_UID']) ? $contentSchema['PRO_UID'] : ''; + + if (isset($_POST["form"]["PRO_UID"]) && !empty($_POST["form"]["PRO_UID"])) { + $tableData->PRO_UID = $_POST["form"]["PRO_UID"]; + } else { + $tableData->PRO_UID = isset($contentSchema["PRO_UID"])? $contentSchema["PRO_UID"] : ""; + } + $tableData->REP_TAB_TYPE = isset($contentSchema['ADD_TAB_TYPE']) ? $contentSchema['ADD_TAB_TYPE'] : ''; $tableData->REP_TAB_GRID = isset($contentSchema['ADD_TAB_GRID']) @@ -1581,4 +1587,4 @@ class pmTablesProxy extends HttpProxyController return $aFields; } } - \ No newline at end of file + diff --git a/workflow/engine/templates/pmTables/list.js b/workflow/engine/templates/pmTables/list.js index 3a402dcec..bd221da6d 100755 --- a/workflow/engine/templates/pmTables/list.js +++ b/workflow/engine/templates/pmTables/list.js @@ -515,6 +515,10 @@ ImportPMTable = function(){ fieldLabel: '', boxLabel: _('ID_OVERWRITE_EXIST'), // 'Overwrite if exists?', name: 'form[OVERWRITE]' + }, { + xtype: "hidden", + name: "form[PRO_UID]", + value: (typeof PRO_UID == "string" && PRO_UID != "")? PRO_UID : "" }], buttons: [{ text: _('ID_UPLOAD'),