BUG 6905 solucionado problema el ordenamiento de inputs versionados

This commit is contained in:
Alvaro Campos
2011-07-07 09:18:22 -04:00
parent 5e3cd2b0f6
commit 70da54b308

View File

@@ -3091,7 +3091,8 @@ class Cases {
$oCriteria->add(AppDocumentPeer::APP_DOC_TYPE, array('INPUT', 'ATTACHED'), CRITERIA::IN); $oCriteria->add(AppDocumentPeer::APP_DOC_TYPE, array('INPUT', 'ATTACHED'), CRITERIA::IN);
$oCriteria->add(AppDocumentPeer::APP_DOC_STATUS, array('ACTIVE'), Criteria::IN); $oCriteria->add(AppDocumentPeer::APP_DOC_STATUS, array('ACTIVE'), Criteria::IN);
//$oCriteria->add($oCriteria->getNewCriterion(AppDocumentPeer::APP_DOC_UID, $aObjectPermissions['INPUT_DOCUMENTS'], Criteria::IN)->addOr($oCriteria->getNewCriterion(AppDocumentPeer::USR_UID, array($sUserUID,'-1'), Criteria::IN))); //$oCriteria->add($oCriteria->getNewCriterion(AppDocumentPeer::APP_DOC_UID, $aObjectPermissions['INPUT_DOCUMENTS'], Criteria::IN)->addOr($oCriteria->getNewCriterion(AppDocumentPeer::USR_UID, array($sUserUID,'-1'), Criteria::IN)));
$oCriteria->addAscendingOrderByColumn(AppDocumentPeer::APP_DOC_INDEX); $oCriteria->addAscendingOrderByColumn(AppDocumentPeer::APP_DOC_UID);
$oDataset = AppDocumentPeer::doSelectRS($oCriteria); $oDataset = AppDocumentPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
@@ -3155,13 +3156,14 @@ class Cases {
$oDataset->next(); $oDataset->next();
} }
global $_DBArray; global $_DBArray;
$_DBArray['inputDocuments'] = $aInputDocuments; $_DBArray['inputDocuments'] = $aInputDocuments;
$_SESSION['_DBArray'] = $_DBArray; $_SESSION['_DBArray'] = $_DBArray;
G::LoadClass('ArrayPeer'); G::LoadClass('ArrayPeer');
$oCriteria = new Criteria('dbarray'); $oCriteria = new Criteria('dbarray');
$oCriteria->setDBArrayTable('inputDocuments'); $oCriteria->setDBArrayTable('inputDocuments');
$oCriteria->addAscendingOrderByColumn(AppDocumentPeer::APP_DOC_INDEX); // $oCriteria->addAscendingOrderByColumn(AppDocumentPeer::APP_DOC_CREATE_DATE);
return $oCriteria; return $oCriteria;
} catch (exception $oException) { } catch (exception $oException) {
throw $oException; throw $oException;