Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #14266.

Browse Source
This commit is contained in:
hufangzhou
2021-08-13 13:55:15 +08:00
parent 341d3a5fd4
commit 4d3e4aa7f5
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+6
View File
@@ -1042,6 +1042,8 @@ class actionModel extends model
}
$objectNames['user'][0] = 'guest'; // Add guest account.
/* Get the same dept department. */
$deptUsers = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
foreach($actions as $i => $action)
{
/* Add name field to the actions. */
@@ -1118,6 +1120,10 @@ class actionModel extends model
$appendLib = $docLib->deleted == '1' ? $action->objectID : 0;
$action->objectLink = helper::createLink('doc', 'objectLibs', sprintf($vars, $docLib->type, $docLib->objectID, $action->objectID, $appendLib));
}
elseif($action->objectType == 'user')
{
$action->objectLink = !isset($deptUsers[$action->objectID]) ? 'javascript:void(0)' : helper::createLink($moduleName, $methodName, sprintf($vars, $action->objectID), '', '', $projectID);
}
else
{
$action->objectLink = helper::createLink($moduleName, $methodName, sprintf($vars, $action->objectID), '', '', $projectID);