From facb35a4e5edcabddbad5c7cd0e1d5d7df4b2ac0 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Tue, 29 Jun 2021 09:23:37 +0800
Subject: [PATCH] * Adjust code.

---
 module/action/model.php              | 13 +++++++++++--
 module/company/view/dynamic.html.php |  2 +-
 module/my/view/dynamic.html.php      |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/module/action/model.php b/module/action/model.php
index dd305991a8..3a1d42fc91 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -1057,9 +1057,18 @@ class actionModel extends model
                     continue;
                 }
 
-                if($action->objectType == 'story' and strpos('import2storylib,passapproved', $action->action) !== false)
+                if(isset($this->config->maxVersion) and strpos($this->config->action->assetType, $action->objectType) !== false and strpos($this->config->action->assetlibAction[$action->objectType], $action->action) !== false)
                 {
-                    $action->objectLink = helper::createLink('assetlib', 'storyView', sprintf($vars, $action->objectID), '', '', $projectID);
+                    if($action->objectType == 'doc')
+                    {
+                        $method = strpos($action->action, 'practice') ? 'practiceView' : 'componentView';
+                    }
+                    else
+                    {
+                        $method = $this->config->action->assetViewMethod[$action->objectType];
+                    }
+
+                    $action->objectLink = helper::createLink('assetlib', $method, sprintf($vars, $action->objectID), '', '', $projectID);
                 }
                 else
                 {
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index 5b854316c4..a8c1062146 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -62,7 +62,7 @@
               <?php $openApp = '';?>
               <?php if($action->objectType == 'meeting') $openApp = $action->project ? "data-app='project'" : "data-app='my'";?>
               <?php
-              if(isset($config->action->assetlibModule) and strpos($config->action->assetlibModule, $action->objectType) !== false and $action->action == 'rejectapproved')
+              if(isset($config->maxVersion) and strpos($config->action->assetType, $action->objectType) !== false and $action->action == 'approved' and !empty($action->extra))
               {
                   echo $action->extra;
               }
diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php
index 0489856697..39236e8b36 100644
--- a/module/my/view/dynamic.html.php
+++ b/module/my/view/dynamic.html.php
@@ -60,7 +60,7 @@
               <?php $openApp = '';?>
               <?php if($action->objectType == 'meeting') $openApp = $action->project ? "data-app='project'" : "data-app='my'";?>
               <?php
-              if(isset($config->action->assetlibModule) and strpos($config->action->assetlibModule, $action->objectType) !== false and $action->action == 'rejectapproved')
+              if(isset($config->maxVersion) and strpos($config->action->assetType, $action->objectType) !== false and $action->action == 'approved' and !empty($action->extra))
               {
                   echo $action->extra;
               }