From 3898d35852ff1478ab4e2a2c85adc75f0b57a6da Mon Sep 17 00:00:00 2001
From: Wenrui LI <liwenrui@easycorp.ltd>
Date: Thu, 2 Dec 2021 15:00:15 +0800
Subject: [PATCH 1/4] * fix unable to click on pager links in cards.

---
 module/bug/css/x.browse.css      | 3 ++-
 module/execution/css/x.bug.css   | 3 ++-
 module/execution/css/x.story.css | 3 ++-
 module/execution/css/x.task.css  | 3 ++-
 module/product/css/x.browse.css  | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/module/bug/css/x.browse.css b/module/bug/css/x.browse.css
index 21c6eddfeb..0810fb1976 100644
--- a/module/bug/css/x.browse.css
+++ b/module/bug/css/x.browse.css
@@ -13,6 +13,7 @@ body {margin-bottom: 0px !important;}
 .table-footer{position: fixed; width: 100%; bottom: 0;}
 .linkButton {float: right; padding-right: 10px; line-height: 34px;}
 .main-table a {pointer-events: none; color: unset !important;}
+.pager a {pointer-events: unset;}
 .table-responsive {margin-bottom: unset;}
 ::-webkit-scrollbar {width: 10px; height: 10px;}
-::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}
\ No newline at end of file
+::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}
diff --git a/module/execution/css/x.bug.css b/module/execution/css/x.bug.css
index 18fd094332..1097133643 100644
--- a/module/execution/css/x.bug.css
+++ b/module/execution/css/x.bug.css
@@ -16,6 +16,7 @@ body {margin-bottom: 0px !important;}
 .table-footer .pager li *{color: #838a9d !important;}
 .linkButton {float: right; padding-right: 10px; line-height: 34px;}
 .main-table a {pointer-events: none; color: unset !important;}
+.pager a {pointer-events: unset;}
 .table-responsive {margin-bottom: unset;}
 ::-webkit-scrollbar {width: 10px; height: 10px;}
-::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}
\ No newline at end of file
+::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}
diff --git a/module/execution/css/x.story.css b/module/execution/css/x.story.css
index 5ed751d763..053395bf7c 100644
--- a/module/execution/css/x.story.css
+++ b/module/execution/css/x.story.css
@@ -22,6 +22,7 @@ body {margin-bottom: 0px !important;}
 .table-footer .pager li *{color: #838a9d !important;}
 .linkButton {float: right; padding-right: 10px; line-height: 34px;}
 .main-table a {pointer-events: none; color: unset !important;}
+.pager a {pointer-events: unset;}
 .table-responsive {margin-bottom: unset;}
 ::-webkit-scrollbar {width: 10px; height: 10px;}
-::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}
\ No newline at end of file
+::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}
diff --git a/module/execution/css/x.task.css b/module/execution/css/x.task.css
index 18fd094332..1097133643 100644
--- a/module/execution/css/x.task.css
+++ b/module/execution/css/x.task.css
@@ -16,6 +16,7 @@ body {margin-bottom: 0px !important;}
 .table-footer .pager li *{color: #838a9d !important;}
 .linkButton {float: right; padding-right: 10px; line-height: 34px;}
 .main-table a {pointer-events: none; color: unset !important;}
+.pager a {pointer-events: unset;}
 .table-responsive {margin-bottom: unset;}
 ::-webkit-scrollbar {width: 10px; height: 10px;}
-::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}
\ No newline at end of file
+::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}
diff --git a/module/product/css/x.browse.css b/module/product/css/x.browse.css
index 18fd094332..1097133643 100644
--- a/module/product/css/x.browse.css
+++ b/module/product/css/x.browse.css
@@ -16,6 +16,7 @@ body {margin-bottom: 0px !important;}
 .table-footer .pager li *{color: #838a9d !important;}
 .linkButton {float: right; padding-right: 10px; line-height: 34px;}
 .main-table a {pointer-events: none; color: unset !important;}
+.pager a {pointer-events: unset;}
 .table-responsive {margin-bottom: unset;}
 ::-webkit-scrollbar {width: 10px; height: 10px;}
-::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}
\ No newline at end of file
+::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}

From 4617c4218bb90c2674af227ccab2a60a6e30481a Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 2 Dec 2021 15:11:05 +0800
Subject: [PATCH 2/4] * Remove the unused code.

---
 xuanxuan/module/message/ext/config/xuanxuan.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/xuanxuan/module/message/ext/config/xuanxuan.php b/xuanxuan/module/message/ext/config/xuanxuan.php
index 7e1ba6a874..2c118573b6 100644
--- a/xuanxuan/module/message/ext/config/xuanxuan.php
+++ b/xuanxuan/module/message/ext/config/xuanxuan.php
@@ -1,7 +1,6 @@
 <?php
-$config->message->available['xuanxuan']['story']   = $config->message->objectTypes['story'];
-$config->message->available['xuanxuan']['task']    = $config->message->objectTypes['task'];
-$config->message->available['xuanxuan']['bug']     = $config->message->objectTypes['bug'];
-$config->message->available['xuanxuan']['todo']    = $config->message->objectTypes['todo'];
-$config->message->available['xuanxuan']['release'] = $config->message->objectTypes['release'];
-$config->message->setting['xuanxuan']['setting']   = $config->message->available['xuanxuan'];
+$config->message->available['xuanxuan']['story'] = $config->message->objectTypes['story'];
+$config->message->available['xuanxuan']['task']  = $config->message->objectTypes['task'];
+$config->message->available['xuanxuan']['bug']   = $config->message->objectTypes['bug'];
+$config->message->available['xuanxuan']['todo']  = $config->message->objectTypes['todo'];
+$config->message->setting['xuanxuan']['setting'] = $config->message->available['xuanxuan'];

From fac5fc6b2260687daee4be777d8fd3cf174c5951 Mon Sep 17 00:00:00 2001
From: Wenrui LI <liwenrui@easycorp.ltd>
Date: Thu, 2 Dec 2021 15:22:12 +0800
Subject: [PATCH 3/4] * remove console.log.

---
 module/bug/view/view.html.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 131a90580f..fee19c93f4 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -14,7 +14,6 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::set('sysurl', common::getSysUrl());?>
 <?php $browseLink = $app->session->bugList ? $app->session->bugList : inlink('browse', "productID=$bug->product");?>
-<?php echo("<script>console.log('".json_encode($_SERVER["QUERY_STRING"])."');</script>");?>
 <?php if(strpos($_SERVER["QUERY_STRING"], 'displayNotice=card') === false):?>
 <div id="mainMenu" class="clearfix">
 <?php if($this->app->getViewType() == 'xhtml'):?>

From 24440ff5266f15774952898c1e0692e965f7525b Mon Sep 17 00:00:00 2001
From: Wenrui LI <liwenrui@easycorp.ltd>
Date: Thu, 2 Dec 2021 15:30:31 +0800
Subject: [PATCH 4/4] * replace link title text with lang items.

---
 module/bug/view/browse.html.php      |  6 +++---
 module/bug/view/view.html.php        |  2 +-
 module/common/lang/en.php            |  1 +
 module/common/lang/zh-cn.php         |  1 +
 module/execution/view/bug.html.php   |  2 +-
 module/execution/view/story.html.php |  2 +-
 module/execution/view/task.html.php  | 12 ++++++------
 module/product/view/browse.html.php  |  8 ++++----
 module/story/view/view.html.php      |  2 +-
 module/task/view/view.html.php       |  2 +-
 10 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 67c8309a4f..c5c59f839c 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -192,7 +192,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
   <?php echo $this->product->getByID($productID)->name ?>
   </strong>
   <div class="linkButton" onclick="linkButtonClicked()">
-    <span title="查看详情">
+    <span title="<?php echo $lang->viewDetails;?>">
       <i class="icon icon-import icon-rotate-270"></i>
     </span>
   </div>
@@ -263,7 +263,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
         <thead>
           <tr>
           <?php if($this->app->getViewType() == 'xhtml'):?>
-          <?php 
+          <?php
           foreach($setting as $value)
           {
               if($value->id == 'title' || $value->id == 'id' || $value->id == 'pri' || $value->id == 'status')
@@ -296,7 +296,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
           <?php foreach($bugs as $bug):?>
           <tr data-id='<?php echo $bug->id?>'>
             <?php if($this->app->getViewType() == 'xhtml'):?>
-            <?php 
+            <?php
               foreach($setting as $value)
               {
                   if($value->id == 'title' || $value->id == 'id' || $value->id == 'pri' || $value->id == 'status'){
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index fee19c93f4..d0d403495e 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -18,7 +18,7 @@
 <div id="mainMenu" class="clearfix">
 <?php if($this->app->getViewType() == 'xhtml'):?>
 <div class="linkButton" onclick="linkButtonClicked()">
-  <span title="查看详情">
+  <span title="<?php echo $lang->viewDetails;?>">
     <i class="icon icon-import icon-rotate-270"></i>
   </span>
 </div>
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 5c105d49bb..aa5fb3eea3 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -76,6 +76,7 @@ $lang->whitelist      = 'Access whitelist';
 $lang->globalSetting  = 'Global Setting';
 $lang->waterfallModel = 'Waterfall';
 $lang->all            = 'All';
+$lang->viewDetails    = 'View Details';
 
 $lang->actions         = 'Action';
 $lang->restore         = 'Reset';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index faf2bfa9bd..bf037b48d6 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -76,6 +76,7 @@ $lang->whitelist      = '访问白名单';
 $lang->globalSetting  = '全局设置';
 $lang->waterfallModel = '瀑布模型';
 $lang->all            = '所有';
+$lang->viewDetails    = '查看详情';
 
 $lang->actions         = '操作';
 $lang->restore         = '恢复默认';
diff --git a/module/execution/view/bug.html.php b/module/execution/view/bug.html.php
index 0166d62cf8..f2aa6d5869 100644
--- a/module/execution/view/bug.html.php
+++ b/module/execution/view/bug.html.php
@@ -35,7 +35,7 @@
   <?php echo $this->execution->getByID($execution->id)->name ?>
   </strong>
   <div class="linkButton" onclick="linkButtonClicked()">
-    <span title="查看详情">
+    <span title="<?php echo $lang->viewDetails;?>">
       <i class="icon icon-import icon-rotate-270"></i>
     </span>
   </div>
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index c77d4d065b..59aabbe4de 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -143,7 +143,7 @@
   <?php echo $this->execution->getByID($execution->id)->name ?>
   </strong>
   <div class="linkButton" onclick="linkButtonClicked()">
-    <span title="查看详情">
+    <span title="<?php echo $lang->viewDetails;?>">
       <i class="icon icon-import icon-rotate-270"></i>
     </span>
   </div>
diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php
index a155b0facb..448dbb89ec 100644
--- a/module/execution/view/task.html.php
+++ b/module/execution/view/task.html.php
@@ -184,7 +184,7 @@ body {margin-bottom: 25px;}
   <?php echo $this->execution->getByID($executionID)->name ?>
   </strong>
   <div class="linkButton" onclick="linkButtonClicked()">
-    <span title="查看详情">
+    <span title="<?php echo $lang->viewDetails;?>">
       <i class="icon icon-import icon-rotate-270"></i>
     </span>
   </div>
@@ -249,7 +249,7 @@ body {margin-bottom: 25px;}
         <thead>
           <tr>
           <?php if($this->app->getViewType() == 'xhtml'):?>
-          <?php 
+          <?php
           foreach($customFields as $field)
           {
               if($field->id == 'name' || $field->id == 'id' || $field->id == 'pri' || $field->id == 'status')
@@ -279,13 +279,13 @@ body {margin-bottom: 25px;}
           <?php foreach($tasks as $task):?>
           <tr data-id='<?php echo $task->id;?>' data-status='<?php echo $task->status?>' data-estimate='<?php echo $task->estimate?>' data-consumed='<?php echo $task->consumed?>' data-left='<?php echo $task->left?>'>
             <?php if($this->app->getViewType() == 'xhtml'):?>
-            <?php 
+            <?php
             foreach($customFields as $field)
             {
                 if($field->id == 'name' || $field->id == 'id' || $field->id == 'pri' || $field->id == 'status')
                   $this->task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');
             }?>
-            <?php else:?>  
+            <?php else:?>
             <?php foreach($customFields as $field) $this->task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');?>
             <?php endif;?>
           </tr>
@@ -296,13 +296,13 @@ body {margin-bottom: 25px;}
           <?php $class .= ($i + 1 == count($task->children)) ? ' table-child-bottom' : '';?>
           <tr class='table-children<?php echo $class;?> parent-<?php echo $task->id;?>' data-id='<?php echo $child->id?>' data-status='<?php echo $child->status?>' data-estimate='<?php echo $child->estimate?>' data-consumed='<?php echo $child->consumed?>' data-left='<?php echo $child->left?>'>
             <?php if($this->app->getViewType() == 'xhtml'):?>
-            <?php 
+            <?php
             foreach($customFields as $field)
             {
                 if($field->id == 'name' || $field->id == 'id' || $field->id == 'pri' || $field->id == 'status')
                 $this->task->printCell($field, $child, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', true);
             }?>
-            <?php else:?>  
+            <?php else:?>
             <?php foreach($customFields as $field) $this->task->printCell($field, $child, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', true);?>
             <?php endif;?>
           </tr>
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 1e525f9d70..d0bbf018e6 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -237,7 +237,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
   <?php echo $this->product->getByID($productID)->name ?>
   </strong>
   <div class="linkButton" onclick="linkButtonClicked()">
-    <span title="查看详情">
+    <span title="<?php echo $lang->viewDetails;?>">
       <i class="icon icon-import icon-rotate-270"></i>
     </span>
   </div>
@@ -307,7 +307,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
         <thead>
           <tr>
           <?php if($this->app->getViewType() == 'xhtml'):?>
-          <?php 
+          <?php
           foreach($setting as $key => $value)
           {
               if($value->id == 'title' || $value->id == 'id' || $value->id == 'pri' || $value->id == 'status')
@@ -342,7 +342,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
           <tr data-id='<?php echo $story->id?>' data-estimate='<?php echo $story->estimate?>' data-cases='<?php echo zget($storyCases, $story->id, 0);?>'>
             <?php $story->from = $from;?>
             <?php if($this->app->getViewType() == 'xhtml'):?>
-            <?php 
+            <?php
             foreach($setting as $key => $value)
             {
                 if($value->id == 'title' || $value->id == 'id' || $value->id == 'pri' || $value->id == 'status')
@@ -360,7 +360,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
           <?php $class .= ($i + 1 == count($story->children)) ? ' table-child-bottom' : '';?>
           <tr class='table-children<?php echo $class;?> parent-<?php echo $story->id;?>' data-id='<?php echo $child->id?>' data-status='<?php echo $child->status?>' data-estimate='<?php echo $child->estimate?>'>
             <?php if($this->app->getViewType() == 'xhtml'):?>
-            <?php 
+            <?php
             foreach($setting as $key => $value)
             {
                 if($value->id == 'title' || $value->id == 'id' || $value->id == 'pri' || $value->id == 'status')
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 807e5899c2..04a648b643 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -18,7 +18,7 @@
 <div id="mainMenu" class="clearfix">
 <?php if($this->app->getViewType() == 'xhtml'):?>
 <div class="linkButton" onclick="linkButtonClicked()">
-  <span title="查看详情">
+  <span title="<?php echo $lang->viewDetails;?>">
     <i class="icon icon-import icon-rotate-270"></i>
   </span>
 </div>
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 243a63e820..09aff13cc2 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -18,7 +18,7 @@
 <div id="mainMenu" class="clearfix">
 <?php if($this->app->getViewType() == 'xhtml'):?>
 <div class="linkButton" onclick="linkButtonClicked()">
-  <span title="查看详情">
+  <span title="<?php echo $lang->viewDetails;?>">
     <i class="icon icon-import icon-rotate-270"></i>
   </span>
 </div>