diff --git a/workflow/engine/classes/model/AdditionalTables.php b/workflow/engine/classes/model/AdditionalTables.php index 56d33bdf2..dd32680c8 100755 --- a/workflow/engine/classes/model/AdditionalTables.php +++ b/workflow/engine/classes/model/AdditionalTables.php @@ -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);'); diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php index e6d1ff6f7..658f93e5f 100755 --- a/workflow/engine/controllers/pmTablesProxy.php +++ b/workflow/engine/controllers/pmTablesProxy.php @@ -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';