Merge pull request #525 from victorsl/BUG-9677

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
2 changed files with 12 additions and 2 deletions

View File

@@ -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;
}
}

View File

@@ -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'),