fernando/luos
1
0
Fork 0
Code Releases Activity

PM-2639

Browse Source
This commit is contained in:
dheeyi
2015-05-15 15:26:56 -04:00
parent 88c5b931cd
commit c21b6ca59d
2 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
workflow/engine/classes/class.case.php
View File

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

14
workflow/engine/methods/cases/proxyReassignUsersList.php
View File

@@ -52,20 +52,6 @@ function array_sort ($array, $on, $order = SORT_ASC, $query = '')
} }
} }
} }
if(count($new_array) != 0){
foreach ($new_array as $key => $value) {
$arrayKey[$key] = $value['userUid'];
}
$arrayKey = array_unique($arrayKey);
$keys = array_keys($arrayKey);
foreach ($new_array as $key => $value){
if(!in_array($key, $keys)){
unset($new_array[$key]);
}
}
$new_array = array_values($new_array);
}
return $new_array; return $new_array;
} }