Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms

easysoft · Aug 10, 2021 · 5a9f7f7 · 5a9f7f7
2 parents cb40696 + 746cb1f
commit 5a9f7f7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
@@ -64,7 +64,7 @@
               <?php $openApp = '';?>
               <?php if($action->objectType == 'meeting') $openApp = $action->project ? "data-app='project'" : "data-app='my'";?>
               <?php
-              if(isset($config->maxVersion) and strpos($config->action->assetType, $action->objectType) !== false and empty($action->objectName))
+              if((isset($config->maxVersion) and strpos($config->action->assetType, $action->objectType) !== false) or empty($action->objectName))
               {
                   echo '#' . $action->objectID;
               }

diff --git a/module/execution/view/dynamic.html.php b/module/execution/view/dynamic.html.php
@@ -87,7 +87,7 @@
               <span class='label-action'><?php echo ' ' . $action->actionLabel;?></span>
               <span class="text"><?php echo $action->objectLabel;?></span>
               <span class="label label-id"><?php echo $action->objectID;?></span>
-              <?php echo html::a($action->objectLink, $action->objectName);?>
+              <?php if($action->objectName) echo html::a($action->objectLink, $action->objectName);?>
             </span>
           </div>
         </li>

diff --git 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->maxVersion) and strpos($config->action->assetType, $action->objectType) !== false and empty($action->objectName))
+              if((isset($config->maxVersion) and strpos($config->action->assetType, $action->objectType) !== false) or empty($action->objectName))
               {
                   echo '#' . $action->objectID;
               }

diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php
@@ -86,7 +86,7 @@
               <span class='label-action'><?php echo ' ' . $action->actionLabel;?></span>
               <span class="text"><?php echo $action->objectLabel;?></span>
               <span class="label label-id"><?php echo $action->objectID;?></span>
-              <?php echo html::a($action->objectLink, $action->objectName);?>
+              <?php if($action->objectName) echo html::a($action->objectLink, $action->objectName);?>
             </span>
           </div>
         </li>

diff --git a/module/project/view/dynamic.html.php b/module/project/view/dynamic.html.php
@@ -87,7 +87,7 @@
               <span class='label-action'><?php echo ' ' . $action->actionLabel;?></span>
               <span class="text"><?php echo $action->objectLabel;?></span>
               <span class="label label-id"><?php echo $action->objectID;?></span>
-              <?php echo html::a($action->objectLink, $action->objectName);?>
+              <?php if($action->objectName) echo html::a($action->objectLink, $action->objectName);?>
             </span>
           </div>
         </li>

diff --git a/module/user/view/dynamic.html.php b/module/user/view/dynamic.html.php
@@ -55,7 +55,7 @@
               <span class='label-action'><?php echo ' ' . $action->actionLabel;?></span>
               <span class="text-muted"><?php echo $action->objectLabel;?></span>
               <span class="label label-id"><?php echo $action->objectID;?></span>
-              <?php echo html::a($action->objectLink, $action->objectName);?>
+              <?php if($action->objectName) echo html::a($action->objectLink, $action->objectName);?>
             </span>
           </div>
         </li>