From 94680fe4623d0d743b203ec30641ebe45e2d9450 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 31 Aug 2023 09:06:49 +0800
Subject: [PATCH] * Fix bug #37923.

---
 module/common/view/datatable.fix.html.php |  1 +
 module/story/config.php                   |  2 +-
 module/story/model.php                    | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php
index 8775d56ac8..b3aec79cb6 100644
--- a/module/common/view/datatable.fix.html.php
+++ b/module/common/view/datatable.fix.html.php
@@ -6,6 +6,7 @@
 <?php
 $showSwitchLink = true;
 if($currentModule == 'product' && $currentMethod == 'browse') $showSwitchLink = false;
+if($currentModule == 'projectstory' && $currentMethod == 'story') $showSwitchLink = false;
 if($currentModule == 'project' && $currentMethod == 'bug') $showSwitchLink = false;
 if($currentModule == 'execution' && strpos(',all,task,bug,', ",{$currentMethod},") !== false) $showSwitchLink = false;
 if($currentModule == 'bug' && $currentMethod == 'browse') $showSwitchLink = false;
diff --git a/module/story/config.php b/module/story/config.php
index 110e0ea1b3..9dbe3745fe 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -59,7 +59,7 @@ $config->story->datatable->defaultField = array('id', 'title', 'pri', 'plan', 's
 
 $config->story->datatable->fieldList['id']['title']    = 'idAB';
 $config->story->datatable->fieldList['id']['fixed']    = 'left';
-$config->story->datatable->fieldList['id']['width']    = '70';
+$config->story->datatable->fieldList['id']['width']    = '90';
 $config->story->datatable->fieldList['id']['required'] = 'yes';
 $config->story->datatable->fieldList['id']['type']     = 'checkID';
 $config->story->datatable->fieldList['id']['sortType'] = true;
diff --git a/module/story/model.php b/module/story/model.php
index 3f7c1ffad3..ff363a2769 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4804,7 +4804,7 @@ class storyModel extends model
 
                 if(strpos('draft,changing', $story->status) !== false)
                 {
-                    if($canSubmitReview) $menu .= common::printIcon('story', 'submitReview', "storyID=$story->id&from=story", $story, 'list', 'confirm', '', 'iframe', true, "data-width='50%'");
+                    if($canSubmitReview) $menu .= common::buildIconButton('story', 'submitReview', "storyID=$story->id&from=story", $story, 'list', 'confirm', '', 'iframe', true, "data-width='50%'");
                 }
                 else
                 {
@@ -4812,7 +4812,7 @@ class storyModel extends model
                     {
                         $reviewDisabled = in_array($this->app->user->account, $story->notReview) and ($story->status == 'draft' or $story->status == 'changing') ? '' : 'disabled';
                         $story->from = 'execution';
-                        $menu .= common::printIcon('story', 'review', "story={$story->id}&from=execution", $story, 'list', 'search', '', $reviewDisabled, false, "data-group=execution");
+                        $menu .= common::buildIconButton('story', 'review', "story={$story->id}&from=execution", $story, 'list', 'search', '', $reviewDisabled, false, "data-group=execution");
                     }
                 }
 
@@ -4820,7 +4820,7 @@ class storyModel extends model
                 {
                     $recallDisabled = empty($story->reviewedBy) and strpos('draft,changing', $story->status) !== false and !empty($story->reviewer) ? '' : 'disabled';
                     $title  = $story->status == 'changing' ? $this->lang->story->recallChange : $this->lang->story->recall;
-                    $menu  .= common::printIcon('story', 'recall', "story={$story->id}", $story, 'list', 'undo', 'hiddenwin', $recallDisabled, '', '', $title);
+                    $menu  .= common::buildIconButton('story', 'recall', "story={$story->id}", $story, 'list', 'undo', 'hiddenwin', $recallDisabled, '', '', $title);
                 }
 
                 $this->lang->task->create = $this->lang->execution->wbs;
@@ -4832,11 +4832,11 @@ class storyModel extends model
                 }
                 else
                 {
-                    if($hasDBPriv and $storyType == 'story') $menu .= common::printIcon('task', 'create', $param, '', 'list', 'plus', '', 'btn-task-create ' . $toTaskDisabled);
+                    if($hasDBPriv and $storyType == 'story') $menu .= common::buildIconButton('task', 'create', $param, '', 'list', 'plus', '', 'btn-task-create ' . $toTaskDisabled);
                 }
 
                 $this->lang->task->batchCreate = $this->lang->execution->batchWBS;
-                if($hasDBPriv and $storyType == 'story') $menu .= common::printIcon('task', 'batchCreate', "executionID=$executionID&story={$story->id}", '', 'list', 'pluses', '', $toTaskDisabled);
+                if($hasDBPriv and $storyType == 'story') $menu .= common::buildIconButton('task', 'batchCreate', "executionID=$executionID&story={$story->id}", '', 'list', 'pluses', '', $toTaskDisabled);
 
                 if(($canSubmitReview or $canReview or $canRecall or $canCreateTask or $canBatchCreateTask) and ($canCreateCase or $canEstimate or $canUnlinkStory))
                 {