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

Merge remote branch 'upstream/master' into BUG-11075

Browse Source
This commit is contained in:
Hector Cortez
2013-04-05 09:24:06 -04:00
parent ee74f95b4c 2c3aa66759
commit bb33e69c8a
12 changed files with 67 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/classes/class.applications.php
View File

@@ -232,7 +232,12 @@ class Applications
if ($dateFrom != '') {
if ($dateTo != '') {
$Criteria->add( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->addAnd( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
if ($dateFrom == $dateTo) {
$dateAux = $dateFrom;
$dateFrom = $dateAux . " 00:00:00";
$dateTo = $dateAux . " 23:23:59";
}
$Criteria->add( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->addAnd( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
$CriteriaCount->add( $CriteriaCount->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->addAnd( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
} else {
$Criteria->add( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL );

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

@@ -649,9 +649,9 @@ class AdditionalTables extends BaseAdditionalTables
foreach ($caseData as $dKey => $dValue) {
if (!is_array($dValue)) {
foreach ($fieldTypes as $key => $fieldType) {
foreach ($fieldType as $name => $type) {
foreach ($fieldType as $name => $theType) {
if (strtoupper($dKey) == $name) {
$caseData[$dKey] = validateType ($dValue, $type);
$caseData[$dKey] = validateType ($dValue, $theType);
unset($name);
}
}
@@ -787,7 +787,9 @@ class AdditionalTables extends BaseAdditionalTables
$obj->fromArray(array_change_key_case($caseData, CASE_UPPER), BasePeer::TYPE_FIELDNAME);
$obj->setAppUid($appUid);
$obj->setAppNumber($appNumber);
$obj->setAppStatus($appStatus);
if (method_exists($obj, 'setAppStatus')) {
$obj->setAppStatus($appStatus);
}
$obj->save();
}
break;
@@ -807,6 +809,9 @@ class AdditionalTables extends BaseAdditionalTables
$obj->fromArray(array_change_key_case($gridRow, CASE_UPPER), BasePeer::TYPE_FIELDNAME);
$obj->setAppUid($appUid);
$obj->setAppNumber($appNumber);
if (method_exists($obj, 'setAppStatus')) {
$obj->setAppStatus($appStatus);
}
$obj->setRow($i);
$obj->save();
}