From 6fdb4fd97f3836918ebf97ec85423c620eacea5c Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 23 Aug 2021 14:39:58 +0800 Subject: [PATCH] * Finish task #41721. --- module/action/model.php | 4 ++++ module/company/view/dynamic.html.php | 4 ++++ module/my/view/dynamic.html.php | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/module/action/model.php b/module/action/model.php index 8bc4b43fa6..c8e3d7430f 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1125,6 +1125,10 @@ class actionModel extends model { $action->objectLink = !isset($deptUsers[$action->objectID]) ? 'javascript:void(0)' : helper::createLink($moduleName, $methodName, sprintf($vars, $action->objectID)); } + elseif($action->objectType == 'stakeholder' and empty($action->project) and strpos($action->product, ',0,') !== false) + { + $action->objectLink = ''; + } else { $action->objectLink = helper::createLink($moduleName, $methodName, sprintf($vars, $action->objectID)); diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php index fd03d8ab1a..591a73a589 100644 --- a/module/company/view/dynamic.html.php +++ b/module/company/view/dynamic.html.php @@ -68,6 +68,10 @@ { echo '#' . $action->objectID; } + elseif(empty($action->objectLink)) + { + echo $action->objectName; + } else { echo html::a($action->objectLink, $action->objectName, '', $openApp); diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php index e375481f11..38253507bc 100644 --- a/module/my/view/dynamic.html.php +++ b/module/my/view/dynamic.html.php @@ -64,6 +64,10 @@ { echo '#' . $action->objectID; } + elseif(empty($action->objectLink)) + { + echo $action->objectName; + } else { echo html::a($action->objectLink, $action->objectName, '', $openApp);