From 30f78a965d073eff66fd0e2e8f1ecf1291455ebd Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@easycorp.ltd>
Date: Wed, 20 Mar 2024 13:33:27 +0800
Subject: [PATCH] * Finish task #113257,113262.

---
 module/datatable/control.php      | 4 ++--
 module/product/ui/browse.html.php | 2 +-
 module/story/ui/view.html.php     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/datatable/control.php b/module/datatable/control.php
index b3c4044fcf..5828cf1304 100644
--- a/module/datatable/control.php
+++ b/module/datatable/control.php
@@ -129,9 +129,9 @@ class datatable extends control
         {
             unset($cols['product'], $cols['module']);
             if($extra != 'requirement') unset($cols['SRS']);
-            if($extra == 'requirement')
+            if($extra != 'story')
             {
-                foreach(array('plan', 'stage', 'taskCount', 'bugCount', 'caseCount', 'URS') as $field) unset($cols[$field]);
+                foreach(array('taskCount', 'bugCount', 'caseCount', 'URS') as $field) unset($cols[$field]);
                 $cols['title']['title'] = str_replace($this->lang->SRCommon, $this->lang->URCommon, $this->lang->story->title);
             }
         }
diff --git a/module/product/ui/browse.html.php b/module/product/ui/browse.html.php
index 0311a8ea6f..ad91847c37 100644
--- a/module/product/ui/browse.html.php
+++ b/module/product/ui/browse.html.php
@@ -181,7 +181,7 @@ $config->story->dtable->fieldList['title']['title'] = $lang->story->title;
 if($app->rawModule == 'projectstory') $config->story->dtable->fieldList['title']['link'] = array('url' => helper::createLink('projectstory', 'view', 'storyID={id}&projectID={project}'));
 
 $setting = $this->loadModel('datatable')->getSetting('product', 'browse', false, $storyType);
-if($storyType == 'requirement') unset($setting['plan'], $setting['stage'], $setting['taskCount'], $setting['bugCount'], $setting['caseCount']);
+if($storyType != 'story') unset($setting['taskCount'], $setting['bugCount'], $setting['caseCount']);
 $cols = array_values($setting);
 
 /* DataTable data. */
diff --git a/module/story/ui/view.html.php b/module/story/ui/view.html.php
index 26884ecddb..9cfea07f4f 100644
--- a/module/story/ui/view.html.php
+++ b/module/story/ui/view.html.php
@@ -324,7 +324,7 @@ detailBody
                             $parentChanged ? $lang->story->parent . $lang->story->change : $this->processStatus('story', $story)
                         )
                     ),
-                    $story->type == 'requirement' ? null : item
+                    item
                     (
                         set::trClass('stage-line'),
                         set::name($lang->story->stage),