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

BUG 8068 FIx Bug in the import and export of CSV file.

Browse Source
This commit is contained in:
Hector Cortez
2011-11-25 11:02:31 -04:00
parent 4f649b636b
commit c02c662fa0
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,7 +317,7 @@ class AdditionalTables extends BaseAdditionalTables {
}
}
function getAllData($sUID, $start=NULL, $limit=NULL)
function getAllData($sUID, $start=NULL, $limit=NULL, $keyOrderUppercase = true)
{
$addTab = new AdditionalTables();
$aData = $addTab->load($sUID, true);
@@ -336,13 +336,14 @@ class AdditionalTables extends BaseAdditionalTables {
$oCriteria = new Criteria($aData['DBS_UID']);
//eval('$oCriteria->addSelectColumn("\'1\' AS DUMMY");');
foreach ($aData['FIELDS'] as $aField) {
eval('$oCriteria->addSelectColumn(' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ');');
if ($aField['FLD_KEY'] == '1') {
eval('$oCriteria->addAscendingOrderByColumn(' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ');');
if($keyOrderUppercase==true){
foreach ($aData['FIELDS'] as $aField) {
eval('$oCriteria->addSelectColumn(' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ');');
if ($aField['FLD_KEY'] == '1') {
eval('$oCriteria->addAscendingOrderByColumn(' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ');');
}
}
}
$oCriteriaCount = clone $oCriteria;
//$count = $sClassPeerName::doCount($oCriteria);
eval('$count = '.$sClassPeerName.'::doCount($oCriteria);');

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

@@ -662,7 +662,7 @@ class pmTablesProxy extends HttpProxyController
$sErrorMessages = '';
$sDelimiter = $_POST['CSV_DELIMITER'];
$resultData = $oAdditionalTables->getAllData($_POST['ADD_TAB_UID']);
$resultData = $oAdditionalTables->getAllData($_POST['ADD_TAB_UID'], NULL, NULL, false);
$rows = $resultData['rows'];
$count = $resultData['count'];
@@ -991,7 +991,7 @@ class pmTablesProxy extends HttpProxyController
$c = 0;
foreach ($tablesToExport as $table) {
$tableRecord = $at->load($table->ADD_TAB_UID);
$tableData = $at->getAllData($table->ADD_TAB_UID);
$tableData = $at->getAllData($table->ADD_TAB_UID, NULL, NULL, false);
$table->ADD_TAB_NAME = $tableRecord['ADD_TAB_NAME'];
$rows = $tableData['rows'];
$count = $tableData['count'];
@@ -1053,7 +1053,7 @@ class pmTablesProxy extends HttpProxyController
if ($table->_DATA) {
//export data
$oAdditionalTables = new additionalTables();
$tableData = $oAdditionalTables->getAllData($table->ADD_TAB_UID);
$tableData = $oAdditionalTables->getAllData($table->ADD_TAB_UID, NULL, NULL, false);
$SDATA = serialize($tableData['rows']);
$bufferType = '@DATA';