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

BUG 7826 "Problem Importing New Report tables" Solved!

Browse Source 
- it was occurring because a restructured import code, but is fixed now
This commit is contained in:
Erik Amaru Ortiz
2011-10-10 11:44:54 -04:00
parent d5fc158f0e
commit d5c3ebdfd0
2 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
workflow/engine/classes/model/AdditionalTables.php
View File

@@ -108,25 +108,28 @@ class AdditionalTables extends BaseAdditionalTables {
$oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_NAME);
$oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_CLASS_NAME);
$oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_DESCRIPTION);
$oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_SDW_LOG_INSERT);
$oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_SDW_LOG_UPDATE);
$oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_SDW_LOG_DELETE);
$oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_SDW_LOG_SELECT);
$oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_SDW_MAX_LENGTH);
$oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_SDW_AUTO_DELETE);
//DEPRECATED! $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_SDW_LOG_INSERT);
// $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_SDW_LOG_UPDATE);
// $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_SDW_LOG_DELETE);
// $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_SDW_LOG_SELECT);
// $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_SDW_MAX_LENGTH);
// $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_SDW_AUTO_DELETE);
$oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_PLG_UID);
$oCriteria->addSelectColumn(AdditionalTablesPeer::DBS_UID);
$oCriteria->add(AdditionalTablesPeer::ADD_TAB_NAME, $name, Criteria::LIKE);
$oCriteria->addSelectColumn(AdditionalTablesPeer::PRO_UID);
$oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_TYPE);
$oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_GRID);
$oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_TAG);
// AdditionalTablesPeer::ADD_TAB_NAME is unique
$oCriteria->add(AdditionalTablesPeer::ADD_TAB_NAME, $name, Criteria::EQUAL);
$oDataset = AdditionalTablesPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$aRows = Array();
while ($oDataset->next()) {
$aRows[] = $oDataset->getRow();
}
return sizeof($aRows) > 0 ? $aRows : false;
$oDataset->next();
return $oDataset->getRow();
}
catch (Exception $oError) {
throw($oError);
@@ -541,7 +544,7 @@ class AdditionalTables extends BaseAdditionalTables {
$this->classPeerName = $this->className . 'Peer';
if (!file_exists (PATH_WORKSPACE . 'classes/' . $this->className . '.php') ) {
throw new Exception("ERROR: {$this->className} class file doesn't exit!");
throw new Exception("ERROR: ".PATH_WORKSPACE . 'classes/' . $this->className . '.php'." class file doesn't exit!");
}
require_once PATH_WORKSPACE . 'classes/' . $this->className . '.php';

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

@@ -202,7 +202,7 @@ class pmTablesProxy extends HttpProxyController
// verify if exists.
if ($data['REP_TAB_UID'] == '' || (isset($httpData->forceUid) && $httpData->forceUid)) { //new report table
if ($isReportTable) { //setting default columns
if ($isReportTable && $alterTable) { //setting default columns
$defaultColumns = $this->_getReportTableDefaultColumns($data['REP_TAB_TYPE']);
$columns = array_merge($defaultColumns, $columns);
}
@@ -284,12 +284,13 @@ class pmTablesProxy extends HttpProxyController
$oFields->create($field);
}
if ($isReportTable) {
if ($isReportTable && $alterTable) {
$oAdditionalTables->populateReportTable($data['REP_TAB_NAME'], $pmTable->getDataSource(), $data['REP_TAB_TYPE'], $data['PRO_UID'], $data['REP_TAB_GRID']);
}
$result->success = true;
$result->message = $result->msg = $buildResult;
} catch (Exception $e) {
$buildResult = ob_get_contents();
ob_end_clean();
@@ -401,7 +402,7 @@ class pmTablesProxy extends HttpProxyController
$toSave = false;
if (!file_exists (PATH_WORKSPACE . 'classes/' . $this->className . '.php') ) {
throw new Exception(G::loadTranslation('ID_PMTABLE_CLASS_DOESNT_EXIST', $this->className));
throw new Exception('Create::' . G::loadTranslation('ID_PMTABLE_CLASS_DOESNT_EXIST', $this->className));
}
require_once PATH_WORKSPACE . 'classes/' . $this->className . '.php';
@@ -466,7 +467,7 @@ class pmTablesProxy extends HttpProxyController
$sPath = PATH_DB . SYS_SYS . PATH_SEP . 'classes' . PATH_SEP;
if (!file_exists ($sPath . $this->className . '.php') ) {
throw new Exception(G::loadTranslation('ID_PMTABLE_CLASS_DOESNT_EXIST', $this->className));
throw new Exception('Update:: '.G::loadTranslation('ID_PMTABLE_CLASS_DOESNT_EXIST', $this->className));
}
require_once $sPath . $this->className . '.php';
@@ -502,7 +503,7 @@ class pmTablesProxy extends HttpProxyController
$sPath = PATH_DB . SYS_SYS . PATH_SEP . 'classes' . PATH_SEP;
if (!file_exists ($sPath . $this->className . '.php') ) {
throw new Exception(G::loadTranslation('ID_PMTABLE_CLASS_DOESNT_EXIST', $this->className));
throw new Exception('Destroy:: ' . G::loadTranslation('ID_PMTABLE_CLASS_DOESNT_EXIST', $this->className));
}
require_once $sPath . $this->className . '.php';
@@ -702,7 +703,7 @@ class pmTablesProxy extends HttpProxyController
if ($overWrite) {
if($tableExists !== false) {
$additionalTable->deleteAll($tableExists[0]['ADD_TAB_UID']);
$additionalTable->deleteAll($tableExists['ADD_TAB_UID']);
}
}
else {
@@ -815,6 +816,17 @@ class pmTablesProxy extends HttpProxyController
}
}
}
$additionalTable = new AdditionalTables();
foreach ($processQueueTables as $tablename) {
$table = $additionalTable->loadByName($tablename);
$isReport = $table['PRO_UID'] !== '' ? true : false;
if ($table && $isReport) {
$oAdditionalTables->populateReportTable($tablename, $table['DBS_UID'], $table['ADD_TAB_TYPE'], $table['PRO_UID'], $table['ADD_TAB_GRID']);
}
}
}
if ($errors == '') {