From 2fa0124ed86287d0f6a5a190563cab728d7ff3a2 Mon Sep 17 00:00:00 2001 From: zhouxin Date: Tue, 30 Nov 2021 04:27:11 +0000 Subject: [PATCH] Finish task #45106. --- module/action/model.php | 7 ++++++- module/my/view/dynamic.html.php | 9 +-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/module/action/model.php b/module/action/model.php index 8c289f283e..99d8786c98 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -812,7 +812,7 @@ class actionModel extends model if(!$actions) return array(); $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'action'); - return $this->transformActions($actions);; + return $this->transformActions($actions); } /** @@ -1215,6 +1215,11 @@ class actionModel extends model if($action->objectType == 'stakeholder' and $action->project == 0) $action->objectLink = ''; + if($action->objectType == 'story' and $action->action == 'import2storylib') + { + $action->objectLink = helper::createLink('assetlib', 'storyView', "storyID=$action->objectID"); + } + return $action; } diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php index da09f27036..5546dd3f2b 100644 --- a/module/my/view/dynamic.html.php +++ b/module/my/view/dynamic.html.php @@ -70,14 +70,7 @@ } else { - if($action->objectType == 'story' and $action->action == 'import2storylib') - { - echo html::a(helper::createLink('assetlib', 'storyView', "storyID=$action->objectID"), $action->objectName, '', $tab); - } - else - { - echo html::a($action->objectLink, $action->objectName, '', $tab); - } + echo html::a($action->objectLink, $action->objectName, '', $tab); } ?> objectID;?>