Merge branch 'sprint/29_zhouxin_45106' into 'sprint/168'

Finish task #45106. See merge request easycorp/zentaopms!649
2021-11-30 05:11:52 +00:00
parent 86927c21ad 2fa0124ed8
commit e5a9358acd
1 changed files with 6 additions and 1 deletions
@@ -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;
    }