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

Merge pull request #2258 from gproly/BUG-13748

Browse Source 
BUG-13748 SOLVED En la sección: ADMIN / PM Tables / {seleccionar algún R...
This commit is contained in:
julceslauhub
2014-01-29 08:59:41 -08:00
parent fa231f8fc6 6da77ddb89
commit 5cc2c0eadd
1 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -371,9 +371,21 @@ class AdditionalTables extends BaseAdditionalTables
$oCriteria = new Criteria($aData['DBS_UID']); $oCriteria = new Criteria($aData['DBS_UID']);
//eval('$oCriteria->addSelectColumn("\'1\' AS DUMMY");'); //eval('$oCriteria->addSelectColumn("\'1\' AS DUMMY");');
/*
* data type:
* 'INTEGER' 'BIGINT' 'SMALLINT' 'TINYINT' 'DECIMAL' 'DOUBLE' 'FLOAT' 'REAL'
* 'CHAR' 'VARCHAR' 'LONGVARCHAR' 'BOOLEAN' 'DATE' 'DATETIME' 'TIME'
*/
$types = array('DECIMAL', 'DOUBLE', 'FLOAT', 'REAL');
if ($keyOrderUppercase == true) { if ($keyOrderUppercase == true) {
foreach ($aData['FIELDS'] as $aField) { foreach ($aData['FIELDS'] as $aField) {
eval('$oCriteria->addSelectColumn(' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ');'); $field = '$oCriteria->addSelectColumn(' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ');';
if (in_array($aField['FLD_TYPE'], $types)) {
$field = '$oCriteria->addAsColumn("' . $aField['FLD_NAME'] . '", "round(" . ' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ' . ", 2)" );';
}
eval($field);
/*if ($aField['FLD_KEY'] == '1') { /*if ($aField['FLD_KEY'] == '1') {
eval('$oCriteria->addAscendingOrderByColumn('. $sClassPeerName . '::' . $aField['FLD_NAME'] . ');'); eval('$oCriteria->addAscendingOrderByColumn('. $sClassPeerName . '::' . $aField['FLD_NAME'] . ');');
}*/ }*/
@@ -384,37 +396,27 @@ class AdditionalTables extends BaseAdditionalTables
eval('$count = ' . $sClassPeerName . '::doCount($oCriteria);'); eval('$count = ' . $sClassPeerName . '::doCount($oCriteria);');
if ($filter != '' && is_string($filter)) { if ($filter != '' && is_string($filter)) {
eval('$fieldsTable = ' . $sClassPeerName . '::getFieldNames(BasePeer::TYPE_FIELDNAME);');
$countField = count($fieldsTable);
$stringOr = '$oCriteria->add('; $stringOr = '$oCriteria->add(';
$cont = 0; $closure = '';
$fieldAppUid = ''; $compare = '';
foreach ($fieldsTable as $value) { $types = array('INTEGER', 'BIGINT', 'SMALLINT', 'TINYINT', 'DECIMAL', 'DOUBLE', 'FLOAT', 'REAL');
if ($value != 'APP_UID') { foreach ($aData['FIELDS'] as $aField) {
if (($cont+1) == $countField) { if ($aField['FLD_NAME'] != 'APP_UID') {
if ($aData['FIELDS'][$cont]['FLD_TYPE'] == 'VARCHAR') { $compare = '"%' . $filter . '%", Criteria::LIKE';
$stringOr .= '$oCriteria->getNewCriterion(' . $sClassPeerName . '::' . strtoupper($value) . ', "%' . $filter . '%", Criteria::LIKE)';
} else { if (in_array($aField['FLD_TYPE'], $types)) {
$stringOr .= '$oCriteria->getNewCriterion(' . $sClassPeerName . '::' . strtoupper($value) . ', "' . $filter . '", Criteria::LIKE)'; if (is_numeric($filter)) {
} $compare = '"' . $filter . '", Criteria::EQUAL';
} else { } else {
if ($aData['FIELDS'][$cont]['FLD_TYPE'] == 'VARCHAR') { $compare = 'null, Criteria::ISNULL';
$stringOr .= '$oCriteria->getNewCriterion(' . $sClassPeerName . '::' . strtoupper($value) . ', "%' . $filter . '%", Criteria::LIKE)->addOr('; }
} else { }
$stringOr .= '$oCriteria->getNewCriterion(' . $sClassPeerName . '::' . strtoupper($value) . ', "' . $filter . '", Criteria::LIKE)->addOr(';
} $stringOr = $stringOr . '$oCriteria->getNewCriterion(' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ', ' . $compare . ')->addOr(';
} $closure = $closure . ")";
} else {
$fieldAppUid = $cont;
}
$cont++;
}
for ($c = 0; $c < $countField-1; $c++) {
if ($fieldAppUid !== $c) {
$stringOr .= ')';
} }
} }
$stringOr .= ');'; $stringOr = rtrim($stringOr, '->addOr(') . $closure . ';';
eval($stringOr); eval($stringOr);
$oCriteriaCount = clone $oCriteria; $oCriteriaCount = clone $oCriteria;