fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #525 from victorsl/BUG-9677

Browse Source 
BUG 9677 "No se lista el Report Table importado dentro del..." SOLVED
This commit is contained in:
julceslauhub
2012-09-03 14:33:59 -07:00
parent 2e70cf837a 2be74450d2
commit ba1fab77dd
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/controllers/pmTablesProxy.php
View File

@@ -840,7 +840,13 @@ class pmTablesProxy extends HttpProxyController
$tableData->REP_TAB_NAME = $contentSchema['ADD_TAB_NAME']; $tableData->REP_TAB_NAME = $contentSchema['ADD_TAB_NAME'];
$tableData->REP_TAB_DSC = $contentSchema['ADD_TAB_DESCRIPTION']; $tableData->REP_TAB_DSC = $contentSchema['ADD_TAB_DESCRIPTION'];
$tableData->REP_TAB_CONNECTION = $contentSchema['DBS_UID']; $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']) $tableData->REP_TAB_TYPE = isset($contentSchema['ADD_TAB_TYPE'])
? $contentSchema['ADD_TAB_TYPE'] : ''; ? $contentSchema['ADD_TAB_TYPE'] : '';
$tableData->REP_TAB_GRID = isset($contentSchema['ADD_TAB_GRID']) $tableData->REP_TAB_GRID = isset($contentSchema['ADD_TAB_GRID'])
@@ -1581,4 +1587,4 @@ class pmTablesProxy extends HttpProxyController
return $aFields; return $aFields;
} }
} }

4
workflow/engine/templates/pmTables/list.js
View File

@@ -515,6 +515,10 @@ ImportPMTable = function(){
fieldLabel: '', fieldLabel: '',
boxLabel: _('ID_OVERWRITE_EXIST'), // 'Overwrite if exists?', boxLabel: _('ID_OVERWRITE_EXIST'), // 'Overwrite if exists?',
name: 'form[OVERWRITE]' name: 'form[OVERWRITE]'
}, {
xtype: "hidden",
name: "form[PRO_UID]",
value: (typeof PRO_UID == "string" && PRO_UID != "")? PRO_UID : ""
}], }],
buttons: [{ buttons: [{
text: _('ID_UPLOAD'), text: _('ID_UPLOAD'),