Merge branch 'sprint/231_liumengyi_fixbug' into 'master'

* Fix bug #26838, #26839.

See merge request easycorp/zentaopms!5093

module/action/model.php

@@ -1540,7 +1540,11 @@ class actionModel extends model
                 if($action->objectType == 'story')
                 {
                     $story = $this->loadModel('story')->getByID($action->objectID);
-                    if(!empty($story)) $moduleName = $story->type;
+                    if(!empty($story))
+                    {
+                        $moduleName = $story->type;
+                        $action->objectLink = helper::createLink('story', 'view', "id=$story->id&version=0&param=0&storyType=$story->type");
+                    }
                 }
 
                 if($action->objectType == 'doclib')

module/story/model.php

@@ -4578,7 +4578,7 @@ class storyModel extends model
         $executionID = empty($execution) ? $this->session->execution : $execution->id;
         $account     = $this->app->user->account;
         $storyLink   = helper::createLink('story', 'view', "storyID=$story->id&version=0&param=0&storyType=$story->type");
-        $canView     = common::hasPriv('story', 'view');
+        $canView     = common::hasPriv($story->type, 'view', null, "storyType=$story->type");
 
         if($tab == 'project')
         {