From 57d8bc7cfd4e0ed6dd12ef0555b407d4a8663ba7 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Wed, 14 Sep 2022 08:46:13 +0000
Subject: [PATCH] * modify about task #68933

---
 module/execution/view/story.html.php | 6 ------
 module/product/view/browse.html.php  | 6 ++++++
 module/story/config.php              | 4 ++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index ebc4b69db6..45f9ce52d7 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -32,12 +32,6 @@
 .btn-group a.btn-secondary, .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
 .btn-group button.dropdown-toggle.btn-secondary, .btn-group button.dropdown-toggle.btn-primary {padding:6px;}
 .export {margin-left: 0px !important;}
-#storyList .c-title { border-right: 1px solid #F2F4F7;}
-#storyList .c-pri,
-#storyList .c-openedBy,
-#storyList .c-stage,
-#storyList .c-taskCount,
-#storyList .c-actions  { border-left: 1px solid #F2F4F7;}
 </style>
 <?php $isAllModules = (!empty($module->name) or !empty($product->name) or !empty($branch)) ? false : true;?>
 <?php $sidebarName  = $lang->tree->all;?>
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 67099b3ebe..1c3348c06c 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -41,6 +41,12 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
 .btn-group a i.icon-plus, .btn-group a i.icon-link {font-size: 16px;}
 .btn-group a.btn-secondary, .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
 .btn-group button.dropdown-toggle.btn-secondary, .btn-group button.dropdown-toggle.btn-primary {padding:6px;}
+#productStoryForm #storyList .c-title { border-right: 1px solid #F2F4F7;}
+#productStoryForm #storyList .c-pri,
+#productStoryForm #storyList .c-openedBy,
+#productStoryForm #storyList .c-stage,
+#productStoryForm #storyList .c-taskCount,
+#productStoryForm #storyList .c-actions  { border-left: 1px solid #F2F4F7;}
 </style>
 <div id="mainMenu" class="clearfix">
   <?php if(!$isProjectStory):?>
diff --git a/module/story/config.php b/module/story/config.php
index 3f21a951de..5041555c50 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -55,6 +55,10 @@ $config->story->excludeCheckFileds = ',uploadImage,category,reviewer,reviewDitto
 global $lang, $app;
 $config->story->datatable = new stdclass();
 if($app->tab == 'execution')
+{
+    $config->story->datatable->defaultField = array('id','order', 'pri', 'title', 'plan', 'openedBy', 'assignedTo', 'estimate', 'status', 'stage', 'taskCount', 'actions');
+}
+else if($app->tab == 'product')
 {
     $config->story->datatable->defaultField = array('id', 'title', 'plan', 'pri', 'status', 'openedBy', 'estimate', 'reviewedBy', 'stage', 'assignedTo', 'taskCount', 'actions');
 }