Merged in dheeyi/processmaker/PM-2639 (pull request #2212)

PM-2639
This commit is contained in:
Julio Cesar Laura Avendaño
2015-05-18 12:13:09 -04:00
2 changed files with 10 additions and 4 deletions

View File

@@ -6740,7 +6740,7 @@ class Cases
$rows[] = $rs->getRow();
}
if ($PRO_UID != null) {
if ($PRO_UID != null) {
//Add supervisor
// Users
$oCriteria = new Criteria('workflow');
@@ -6760,8 +6760,10 @@ class Cases
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$flagSupervisors = false;
if ($oDataset->next()) {
$rows[] = $oDataset->getRow();
if ($oDataset->next()) {
if (!in_array($USR_UID,$row)) {
$rows[] = $oDataset->getRow();
}
$flagSupervisors = true;
}
@@ -6789,10 +6791,13 @@ class Cases
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if ($oDataset->next()) {
$rows[] = $oDataset->getRow();
if (!in_array($USR_UID,$row)) {
$rows[] = $oDataset->getRow();
}
}
}
}
return $rows;
}

View File

@@ -52,6 +52,7 @@ function array_sort ($array, $on, $order = SORT_ASC, $query = '')
}
}
}
return $new_array;
}
// $APP_UIDS = explode(',', $_POST['APP_UID']);