Merge branch 'FIX_read_evaluation_of_user_and_subordinates_with_read_right' of github.com:atm-gauthier/dolibarr into FIX_read_evaluation_of_user_and_subordinates_with_read_right
This commit is contained in:
commit
12c7cb1b84
@ -193,7 +193,7 @@ class Evaluation extends CommonObject
|
||||
$this->fields['entity']['enabled'] = 0;
|
||||
}
|
||||
|
||||
if(empty($user->rights->hrm->evaluation->readall)) $this->fields['fk_user']['type'].= ':rowid IN('.$this->db->sanitize(implode(", ", $user->getAllChildIds(1))).')';
|
||||
if (empty($user->rights->hrm->evaluation->readall)) $this->fields['fk_user']['type'].= ':rowid IN('.$this->db->sanitize(implode(", ", $user->getAllChildIds(1))).')';
|
||||
|
||||
$this->date_eval = dol_now();
|
||||
|
||||
|
||||
@ -275,7 +275,7 @@ if ($search_all) {
|
||||
$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
|
||||
}
|
||||
|
||||
if(empty($permissiontoreadall)) {
|
||||
if (empty($permissiontoreadall)) {
|
||||
$sql.= " AND t.fk_user IN(".implode(", ", $user->getAllChildIds(1)).") ";
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user