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

BUG 6639 Fix Completed

Browse Source 
Completed the changes made for GTBank related to Report Tables
This commit is contained in:
Hugo Loza
2011-04-19 15:07:20 -04:00
parent 8470922696
commit bcd2bcaa22
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
workflow/engine/classes/class.reportTables.php
View File

@@ -91,9 +91,9 @@ class ReportTables
$rs = $stmt->executeQuery( 'DROP TABLE IF EXISTS `' . $sTableName . '`'); $rs = $stmt->executeQuery( 'DROP TABLE IF EXISTS `' . $sTableName . '`');
break; break;
case 'mssql': case 'mssql':
$rs = $stmt->executeQuery( "IF OBJECT_ID (N'" . $sTableName . "', N'U') IS NOT NULL $rs = $stmt->executeQuery( "IF OBJECT_ID (N'" . $sTableName . "', N'U') IS NOT NULL
DROP TABLE [" . $sTableName . "]"); DROP TABLE [" . $sTableName . "]");
break; break;
} }
} }
catch (Exception $oError) { catch (Exception $oError) {
@@ -184,7 +184,7 @@ class ReportTables
} }
$rs = $stmt->executeQuery( $sQuery ); $rs = $stmt->executeQuery( $sQuery );
break; break;
} }
} }
@@ -331,7 +331,7 @@ class ReportTables
} }
} }
$sQuery .= ')'; $sQuery .= ')';
$rs = $stmt->executeQuery( $sQuery ); $rs = $stmt->executeQuery( $sQuery );
} }
else { else {
if (isset($aData[$sGrid])) { if (isset($aData[$sGrid])) {
@@ -366,7 +366,7 @@ class ReportTables
} }
$oDataset->next(); $oDataset->next();
} }
break; break;
} }
} }
@@ -422,11 +422,13 @@ class ReportTables
try { try {
$oReportTable = new ReportTable(); $oReportTable = new ReportTable();
$aFields = $oReportTable->load($sRepTabUid); $aFields = $oReportTable->load($sRepTabUid);
$this->dropTable($aFields['REP_TAB_NAME'], $aFields['REP_TAB_CONNECTION']); if(!(empty($aFields))){
$oCriteria = new Criteria('workflow'); $this->dropTable($aFields['REP_TAB_NAME'], $aFields['REP_TAB_CONNECTION']);
$oCriteria->add(ReportVarPeer::REP_TAB_UID, $sRepTabUid); $oCriteria = new Criteria('workflow');
$oDataset = ReportVarPeer::doDelete($oCriteria); $oCriteria->add(ReportVarPeer::REP_TAB_UID, $sRepTabUid);
$oReportTable->remove($sRepTabUid); $oDataset = ReportVarPeer::doDelete($oCriteria);
$oReportTable->remove($sRepTabUid);
}
} }
catch (Exception $oError) { catch (Exception $oError) {
throw($oError); throw($oError);
@@ -764,7 +766,7 @@ class ReportTables
} }
} }
$sQuery .= ')'; $sQuery .= ')';
$rs =$stmt->executeQuery( $sQuery ); $rs =$stmt->executeQuery( $sQuery );
} }
} }
} }
@@ -800,7 +802,7 @@ class ReportTables
G::LoadSystem($sDataBase); G::LoadSystem($sDataBase);
$oDataBase = new database(); $oDataBase = new database();
$bExists = $oDataBase->reportTableExist(); $bExists = $oDataBase->reportTableExist();
} }
return $bExists; return $bExists;
} }

3
workflow/engine/classes/model/ReportTable.php
View File

@@ -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) {

2
workflow/engine/methods/processes/processes_ImportExisting.php
View File

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