lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24420 from atm-adrien/FIX_actionOwner_cant_see_his_events

Browse Source 
FIX : Add the possibility to check events
This commit is contained in:
Laurent Destailleur 2023-04-04 21:30:08 +02:00 committed by GitHub
commit f54383526e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/action/class/actioncomm.class.php
View File

@ -1566,7 +1566,7 @@ class ActionComm extends CommonObject
} }
$canread = 0; $canread = 0;
if ($user->rights->agenda->myactions->read && $this->authorid == $user->id) { if ($user->rights->agenda->myactions->read && ($this->authorid == $user->id || $this->userownerid == $user->id)) {
$canread = 1; // Can read my event $canread = 1; // Can read my event
} }
if ($user->rights->agenda->myactions->read && array_key_exists($user->id, $this->userassigned)) { if ($user->rights->agenda->myactions->read && array_key_exists($user->id, $this->userassigned)) {

1
htdocs/comm/action/list.php
View File

@ -917,6 +917,7 @@ while ($i < $imaxinloop) {
$actionstatic->datep = $db->jdate($obj->dp); $actionstatic->datep = $db->jdate($obj->dp);
$actionstatic->percentage = $obj->percent; $actionstatic->percentage = $obj->percent;
$actionstatic->authorid = $obj->fk_user_author; $actionstatic->authorid = $obj->fk_user_author;
$actionstatic->userownerid = $obj->fk_user_action;
// Initialize $this->userassigned && this->socpeopleassigned array && this->userownerid // Initialize $this->userassigned && this->socpeopleassigned array && this->userownerid
// but only if we need it // but only if we need it