From 626f7346fae3cbc263eedcf05db790acfd25a4cf Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Mon, 28 Jun 2021 13:03:16 +0800
Subject: [PATCH] * Adjust code.

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

diff --git a/module/action/model.php b/module/action/model.php
index 42b80726e0..7acc706150 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -1057,7 +1057,7 @@ class actionModel extends model
                     continue;
                 }
 
-                if($action->objectType == 'story' and strpos('importtostorylib,approve', $action->action) !== false)
+                if($action->objectType == 'story' and strpos('importtostorylib,passapprove', $action->action) !== false)
                 {
                     $action->objectLink = helper::createLink('assetlib', 'storyView', sprintf($vars, $action->objectID), '', '', $projectID);
                 }
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index c12eee658e..5b854316c4 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -61,7 +61,16 @@
               <span class="text"><?php echo $action->objectLabel;?></span>
               <?php $openApp = '';?>
               <?php if($action->objectType == 'meeting') $openApp = $action->project ? "data-app='project'" : "data-app='my'";?>
-              <?php echo html::a($action->objectLink, $action->objectName, '', $openApp);?>
+              <?php
+              if(isset($config->action->assetlibModule) and strpos($config->action->assetlibModule, $action->objectType) !== false and $action->action == 'rejectapproved')
+              {
+                  echo $action->extra;
+              }
+              else
+              {
+                  echo html::a($action->objectLink, $action->objectName, '', $openApp);
+              }
+              ?>
               <span class="label label-id"><?php echo $action->objectID;?></span>
               <?php endif;?>
             </span>
diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php
index 69ade11109..0489856697 100644
--- a/module/my/view/dynamic.html.php
+++ b/module/my/view/dynamic.html.php
@@ -59,7 +59,16 @@
               <span class="text-muted"><?php echo $action->objectLabel;?></span>
               <?php $openApp = '';?>
               <?php if($action->objectType == 'meeting') $openApp = $action->project ? "data-app='project'" : "data-app='my'";?>
-              <?php echo html::a($action->objectLink, $action->objectName, '', $openApp);?>
+              <?php
+              if(isset($config->action->assetlibModule) and strpos($config->action->assetlibModule, $action->objectType) !== false and $action->action == 'rejectapproved')
+              {
+                  echo $action->extra;
+              }
+              else
+              {
+                  echo html::a($action->objectLink, $action->objectName, '', $openApp);
+              }
+              ?>
               <span class="label label-id"><?php echo $action->objectID;?></span>
               <?php endif;?>
             </span>