BUG 6639 Fix Completed
Completed the changes made for GTBank related to Report Tables
This commit is contained in:
@@ -422,12 +422,14 @@ class ReportTables
|
|||||||
try {
|
try {
|
||||||
$oReportTable = new ReportTable();
|
$oReportTable = new ReportTable();
|
||||||
$aFields = $oReportTable->load($sRepTabUid);
|
$aFields = $oReportTable->load($sRepTabUid);
|
||||||
|
if(!(empty($aFields))){
|
||||||
$this->dropTable($aFields['REP_TAB_NAME'], $aFields['REP_TAB_CONNECTION']);
|
$this->dropTable($aFields['REP_TAB_NAME'], $aFields['REP_TAB_CONNECTION']);
|
||||||
$oCriteria = new Criteria('workflow');
|
$oCriteria = new Criteria('workflow');
|
||||||
$oCriteria->add(ReportVarPeer::REP_TAB_UID, $sRepTabUid);
|
$oCriteria->add(ReportVarPeer::REP_TAB_UID, $sRepTabUid);
|
||||||
$oDataset = ReportVarPeer::doDelete($oCriteria);
|
$oDataset = ReportVarPeer::doDelete($oCriteria);
|
||||||
$oReportTable->remove($sRepTabUid);
|
$oReportTable->remove($sRepTabUid);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
catch (Exception $oError) {
|
catch (Exception $oError) {
|
||||||
throw($oError);
|
throw($oError);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -93,7 +93,8 @@ class ReportTable extends BaseReportTable {
|
|||||||
return $aFields;
|
return $aFields;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
throw( new Exception( "The row '$RepTabUid' in table ReportTable doesn't exist!" ));
|
//throw( new Exception( "The row '$RepTabUid' in table ReportTable doesn't exist!" ));
|
||||||
|
return array();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception $oError) {
|
catch (Exception $oError) {
|
||||||
|
|||||||
@@ -73,7 +73,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// if there are duplicated groups render the group importing options
|
// if there are duplicated groups render the group importing options
|
||||||
if($groupsDuplicated>0){
|
if((isset($groupsDuplicated))&&($groupsDuplicated>0)){
|
||||||
$Fields['PRO_FILENAME'] = $filename;
|
$Fields['PRO_FILENAME'] = $filename;
|
||||||
$Fields['PRO_PATH'] = $path;
|
$Fields['PRO_PATH'] = $path;
|
||||||
$Fields['IMPORT_OPTION'] = $option;
|
$Fields['IMPORT_OPTION'] = $option;
|
||||||
|
|||||||
Reference in New Issue
Block a user