From 694410817ae754a60964672121c7b724513e0b97 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Thu, 30 Jun 2022 08:50:31 +0800
Subject: [PATCH 1/4] * fix bug #24382

---
 module/story/view/view.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index c2a92ef17e..14ff9d6f1c 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -307,7 +307,7 @@
                 <?php endif;?>
                 <tr>
                   <th><?php echo $lang->story->category;?></th>
-                  <td><?php echo $lang->story->categoryList[$story->category];?></td>
+                  <td><?php echo zget($lang->story->categoryList, $story->category, $story->category)?></td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->story->pri;?></th>

From a8358b6ba50a3488ecf56a45acd842df55765db7 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Thu, 30 Jun 2022 11:27:04 +0800
Subject: [PATCH 2/4] * fix bug #23954

---
 extension/lite/feedback/ext/view/view.lite.html.hook.php | 3 +++
 extension/lite/todo/ext/view/view.lite.html.hook.php     | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 extension/lite/feedback/ext/view/view.lite.html.hook.php

diff --git a/extension/lite/feedback/ext/view/view.lite.html.hook.php b/extension/lite/feedback/ext/view/view.lite.html.hook.php
new file mode 100644
index 0000000000..8ad5595c4d
--- /dev/null
+++ b/extension/lite/feedback/ext/view/view.lite.html.hook.php
@@ -0,0 +1,3 @@
+<script>
+$("#createCaseActionMenu a[href=#toBug]").remove();
+</script>
diff --git a/extension/lite/todo/ext/view/view.lite.html.hook.php b/extension/lite/todo/ext/view/view.lite.html.hook.php
index fad3ee2b75..56bdae52d4 100644
--- a/extension/lite/todo/ext/view/view.lite.html.hook.php
+++ b/extension/lite/todo/ext/view/view.lite.html.hook.php
@@ -37,7 +37,7 @@ $('#toStoryLink').click(function()
 $('#toStoryButtonByProject').click(function()
 {
     var onlybody  = config.onlybody == 'yes';
-    var projectID = $('#projectToStory').val();    
+    var projectID = $('#projectToStory').val();
     var link      = createLink('story', 'create', 'productID=0&branch=0&moduleID=0&storyID=0&projectID=' + projectID + '&bugID=0&planID=0&todoID=' + todoID, config.defaultView, onlybody);
 
     if(!onlybody) window.parent.$.apps.open(link, 'project');
@@ -75,4 +75,4 @@ function createProject()
     config.onlybody      = onlybody;
     parent.location.href = link;
 }
-</script>
\ No newline at end of file
+</script>

From f73072e6de3938368751ef1ca8d750db60720ac8 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Thu, 30 Jun 2022 15:06:29 +0800
Subject: [PATCH 3/4] * fix bug #23729

---
 module/caselib/css/showimport.css       |  1 +
 module/caselib/view/showimport.html.php | 23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/module/caselib/css/showimport.css b/module/caselib/css/showimport.css
index df3757a2cf..9e7a963939 100644
--- a/module/caselib/css/showimport.css
+++ b/module/caselib/css/showimport.css
@@ -1 +1,2 @@
 .table table td,.outer .table table tbody > tr:last-child td {padding: 2px 0 2px 5px !important; border: none !important;}
+.c-pri{width: 70px;}
diff --git a/module/caselib/view/showimport.html.php b/module/caselib/view/showimport.html.php
index dad8d594e0..848ae78c6a 100644
--- a/module/caselib/view/showimport.html.php
+++ b/module/caselib/view/showimport.html.php
@@ -20,6 +20,7 @@ $(function()
 });
 </script>
 <?php else:?>
+<?php js::set('requiredFields', $requiredFields);?>
 <div id="mainContent" class="main-content">
   <div class="main-header clearfix">
     <h2><?php echo $lang->caselib->import;?></h2>
@@ -29,13 +30,13 @@ $(function()
       <thead>
         <tr>
           <th class='c-number'><?php echo $lang->testcase->id?></th>
-          <th><?php echo $lang->testcase->title?></th>
-          <th class='c-module'><?php echo $lang->testcase->module?></th>
-          <th class='c-status'><?php echo $lang->testcase->pri?></th>
-          <th class='c-status'><?php echo $lang->testcase->type?></th>
-          <th><?php echo $lang->testcase->stage?></th>
-          <th class='c-text'><?php echo $lang->testcase->keywords?></th>
-          <th><?php echo $lang->testcase->precondition?></th>
+          <th class='c-title'        id='title'>       <?php echo $lang->testcase->title?></th>
+          <th class='c-module'       id='module'>      <?php echo $lang->testcase->module?></th>
+          <th class='c-pri'          id='pri'>         <?php echo $lang->testcase->pri?></th>
+          <th class='c-type'         id='type'>        <?php echo $lang->testcase->type?></th>
+          <th class='c-stage'        id='stage'>       <?php echo $lang->testcase->stage?></th>
+          <th class='c-text'         id='keywords'>    <?php echo $lang->testcase->keywords?></th>
+          <th class='c-precondition' id='precondition'><?php echo $lang->testcase->precondition?></th>
           <th class='c-case-step col-content'>
             <table class='w-p100 table-borderless'>
               <tr>
@@ -127,6 +128,12 @@ $(function()
 <style>#mainContent .col-content{display: none;}</style>
 <?php endif;?>
 <script>
-$(function(){$.fixedTableHead('#showData');});
+$(function(){
+    $.fixedTableHead('#showData');
+    $("#showData th").each(function()
+    {
+        if(requiredFields.indexOf(this.id) !== -1) $("#" + this.id).addClass('required');
+    });
+});
 </script>
 <?php include '../../common/view/footer.html.php';?>

From 76b79da0c1a66a154a277c5499bb72aec7374b23 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Thu, 30 Jun 2022 15:20:38 +0800
Subject: [PATCH 4/4] * fix bug #23996

---
 module/caselib/view/showimport.html.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/caselib/view/showimport.html.php b/module/caselib/view/showimport.html.php
index 848ae78c6a..61561bae22 100644
--- a/module/caselib/view/showimport.html.php
+++ b/module/caselib/view/showimport.html.php
@@ -128,7 +128,8 @@ $(function()
 <style>#mainContent .col-content{display: none;}</style>
 <?php endif;?>
 <script>
-$(function(){
+$(function()
+{
     $.fixedTableHead('#showData');
     $("#showData th").each(function()
     {