From 069f009b6da67f34be18a93118367c7af2cccc0d Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Thu, 17 Feb 2022 14:34:11 +0800
Subject: [PATCH 01/12] *Finish task 49283

---
 module/execution/view/bug.html.php        | 2 +-
 module/execution/view/grouptask.html.php  | 2 +-
 module/execution/view/importbug.html.php  | 2 +-
 module/execution/view/importtask.html.php | 2 +-
 module/execution/view/linkstory.html.php  | 2 +-
 module/execution/view/story.html.php      | 2 +-
 module/execution/view/testcase.html.php   | 2 +-
 module/my/view/requirement.html.php       | 2 +-
 module/my/view/story.html.php             | 2 +-
 module/my/view/task.html.php              | 2 +-
 module/my/view/testcase.html.php          | 2 +-
 module/my/view/todo.html.php              | 2 +-
 module/project/view/bug.html.php          | 2 +-
 module/story/view/batchedit.html.php      | 2 +-
 module/story/view/bugs.html.php           | 2 +-
 module/story/view/cases.html.php          | 2 +-
 module/story/view/linkstory.html.php      | 2 +-
 module/story/view/tasks.html.php          | 2 +-
 module/story/view/view.html.php           | 2 +-
 module/story/view/zerocase.html.php       | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/module/execution/view/bug.html.php b/module/execution/view/bug.html.php
index f55bda92a8..8a600fa219 100644
--- a/module/execution/view/bug.html.php
+++ b/module/execution/view/bug.html.php
@@ -80,7 +80,7 @@
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
           <th class='c-severity'><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
-          <th class='c-pri'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri' title=<?php echo $lang->execution->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
           <th><?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
           <th class='c-user'><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
           <th class='c-date text-center'><?php common::printOrderLink('deadline', $orderBy, $vars, $lang->bug->deadlineAB);?></th>
diff --git a/module/execution/view/grouptask.html.php b/module/execution/view/grouptask.html.php
index 1b02351e56..870f20d676 100644
--- a/module/execution/view/grouptask.html.php
+++ b/module/execution/view/grouptask.html.php
@@ -112,7 +112,7 @@
           </div>
         </th>
         <th class="c-id-sm"><?php echo $lang->task->id;?></th>
-        <th class="c-pri"><?php echo $lang->priAB;?></th>
+        <th class="c-pri" title=<?php echo $lang->execution->pri;?>><?php echo $lang->priAB;?></th>
         <th class="c-name text-left"><?php echo $lang->task->name;?></th>
         <th class="c-status"><?php echo $lang->task->status;?></th>
         <th class="text-left c-user"><?php echo $lang->task->assignedTo;?></th>
diff --git a/module/execution/view/importbug.html.php b/module/execution/view/importbug.html.php
index b2fc7eafb1..4eaf81a875 100755
--- a/module/execution/view/importbug.html.php
+++ b/module/execution/view/importbug.html.php
@@ -38,7 +38,7 @@ var browseType = '<?php echo $browseType;?>';
             <?php echo $lang->idAB;?>
           </th>
           <th class='c-severity'> <?php echo $lang->bug->severityAB;?></th>
-          <th class='c-pri'>      <?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->execution->pri;?>><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->bug->title;?></th>
           <th class='c-status'><?php echo $lang->bug->statusAB;?></th>
           <th class='c-pri-box <?php echo in_array('pri',        $requiredFields) ? 'required' : ''?>'><?php echo $lang->task->pri;?></th>
diff --git a/module/execution/view/importtask.html.php b/module/execution/view/importtask.html.php
index 836c8f5f8d..5baf2ceadd 100644
--- a/module/execution/view/importtask.html.php
+++ b/module/execution/view/importtask.html.php
@@ -33,7 +33,7 @@
             <?php echo $lang->idAB;?>
           </th>
           <th class='c-name'><?php echo $lang->execution->name ?></th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->execution->pri;?>><?php echo $lang->priAB;?></th>
           <th class='w-p30'><?php echo $lang->task->name;?></th>
           <th class='c-user'><?php echo $lang->task->assignedTo;?></th>
           <th class='c-hour'><?php echo $lang->task->leftAB;?></th>
diff --git a/module/execution/view/linkstory.html.php b/module/execution/view/linkstory.html.php
index 0a6d336e56..b19a0ad488 100644
--- a/module/execution/view/linkstory.html.php
+++ b/module/execution/view/linkstory.html.php
@@ -39,7 +39,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->execution->pri;?>><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->story->title;?></th>
           <th class='c-object'><?php echo $lang->story->product;?></th>
           <th class='c-module'><?php echo $lang->story->module;?></th>
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 313eab805f..c394332710 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -199,7 +199,7 @@
             <?php if($canOrder):?>
             <th class='c-sort {sorter:false}'><?php common::printOrderLink('order', $orderBy, $vars, $lang->execution->orderAB);?></th>
             <?php endif;?>
-            <th class='c-pri {sorter:false}'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+            <th class='c-pri {sorter:false}' title=<?php echo $lang->execution->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
             <th class='c-name {sorter:false}'><?php common::printOrderLink('title', $orderBy, $vars, $lang->execution->storyTitle);?></th>
             <th class='c-category {sorter:false}'><?php common::printOrderLink('category', $orderBy, $vars, $lang->story->category);?></th>
             <th class='c-user {sorter:false}'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
diff --git a/module/execution/view/testcase.html.php b/module/execution/view/testcase.html.php
index 2de4640de5..6ae9d094b1 100644
--- a/module/execution/view/testcase.html.php
+++ b/module/execution/view/testcase.html.php
@@ -24,7 +24,7 @@
       <thead>
         <tr>
           <th class='w-id'>    <?php common::printOrderLink('id',            $orderBy, $vars, $lang->idAB);?></th>
-          <th class='c-pri'>   <?php common::printOrderLink('pri',           $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri' title=<?php echo $lang->execution->pri;?>>   <?php common::printOrderLink('pri',           $orderBy, $vars, $lang->priAB);?></th>
           <th>                 <?php common::printOrderLink('title',         $orderBy, $vars, $lang->testcase->title);?></th>
           <th class='c-type'>  <?php common::printOrderLink('type',          $orderBy, $vars, $lang->typeAB);?></th>
           <th class='c-user'>  <?php common::printOrderLink('openedBy',      $orderBy, $vars, $lang->openedByAB);?></th>
diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php
index 891d7f6926..48e090ede7 100644
--- a/module/my/view/requirement.html.php
+++ b/module/my/view/requirement.html.php
@@ -58,7 +58,7 @@
             <?php endif;?>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
-          <th class='c-pri w-40px'><?php common::printOrderLink('pri',          $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri w-40px' title=<?php echo $lang->task->pri;?>><?php common::printOrderLink('pri',          $orderBy, $vars, $lang->priAB);?></th>
           <th class='c-name'>      <?php common::printOrderLink('title',        $orderBy, $vars, $lang->my->name);?></th>
           <th class='c-product'>   <?php common::printOrderLink('productTitle', $orderBy, $vars, $lang->story->product);?></th>
           <th class='c-user'>      <?php common::printOrderLink('openedBy',     $orderBy, $vars, $lang->openedByAB);?></th>
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index 029b2dfe62..dd6b6ece46 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -58,7 +58,7 @@
             <?php endif;?>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
-          <th class='c-pri'>      <?php common::printOrderLink('pri',          $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri' title=<?php echo $lang->task->pri;?>><?php common::printOrderLink('pri',          $orderBy, $vars, $lang->priAB);?></th>
           <th class='c-name'>     <?php common::printOrderLink('title',        $orderBy, $vars, $lang->my->name);?></th>
           <th class='c-product'>  <?php common::printOrderLink('productTitle', $orderBy, $vars, $lang->story->product);?></th>
           <th class='c-plan'>     <?php common::printOrderLink('plan',         $orderBy, $vars, $lang->story->plan);?></th>
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 4432aea57a..ca0ef8eade 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -48,7 +48,7 @@
             <?php endif;?>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
-          <th class='c-pri'><?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri' title=<?php echo $lang->task->pri;?>><?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
           <th class='c-name'><?php common::printOrderLink('name',       $orderBy, $vars, $lang->task->name);?></th>
           <?php if($config->systemMode == 'new'):?>
           <th class='c-project'><?php common::printOrderLink('project',    $orderBy, $vars, $lang->my->projects);?></th>
diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php
index a46451540a..5fb935aa04 100644
--- a/module/my/view/testcase.html.php
+++ b/module/my/view/testcase.html.php
@@ -48,7 +48,7 @@
             <?php endif;?>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
-          <th class='c-pri'>      <?php common::printOrderLink('pri',           $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri' title=<?php echo $lang->testcase->pri;?>>      <?php common::printOrderLink('pri',           $orderBy, $vars, $lang->priAB);?></th>
           <th>                    <?php common::printOrderLink('title',         $orderBy, $vars, $lang->testcase->title);?></th>
           <?php if($type == 'assigntome'):?>
           <th class='c-task'>     <?php common::printOrderLink('task',          $orderBy, $vars, $lang->testtask->common);?></th>
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index de64d4e4bc..260d154b23 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -74,7 +74,7 @@
           <th class="c-date">     <?php common::printOrderLink('date',       $orderBy, $vars, $lang->todo->date);?></th>
           <th class="c-type">     <?php common::printOrderLink('type',       $orderBy, $vars, $lang->todo->type);?></th>
           <?php $style = $this->app->clientLang == 'en' ? "style='width:80px'" : '';?>
-          <th class="c-pri" <?php echo $style;?>> <?php common::printOrderLink('pri',    $orderBy, $vars, $lang->priAB);?></th>
+          <th class="c-pri" <?php echo $style;?> title=<?php echo $lang->todo->pri;?>> <?php common::printOrderLink('pri',    $orderBy, $vars, $lang->priAB);?></th>
           <th class="c-name">     <?php common::printOrderLink('name',       $orderBy, $vars, $lang->todo->name);?></th>
           <th class="c-user">     <?php common::printOrderLink('assignedBy', $orderBy, $vars, $lang->todo->assignedBy);?></th>
           <th class="c-begin">    <?php common::printOrderLink('begin',      $orderBy, $vars, $lang->todo->beginAB);?></th>
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index d4d985bfc6..bd0167764a 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -57,7 +57,7 @@
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
           <th class='c-severity'><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
-          <th class='c-pri'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri' title=<?php echo $lang->project->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
           <th><?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
           <th class='c-user'><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
           <th class='c-user'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php
index 09f99ddc88..4dc2268e8a 100644
--- a/module/story/view/batchedit.html.php
+++ b/module/story/view/batchedit.html.php
@@ -50,7 +50,7 @@ foreach(explode(',', $showFields) as $field)
           <th class='c-title required'><?php echo $lang->story->title;?></th>
           <th class='c-estimate<?php echo zget($visibleFields, 'estimate', ' hidden')?>'> <?php echo $lang->story->estimateAB;?></th>
           <th class='c-category'><?php echo $lang->story->category;?></th>
-          <th class='c-pri<?php echo zget($visibleFields, 'pri', ' hidden')?>'> <?php echo $lang->priAB;?></th>
+          <th class='c-pri<?php echo zget($visibleFields, 'pri', ' hidden')?>' title=<?php echo $lang->story->pri;?>> <?php echo $lang->priAB;?></th>
           <th class='c-user<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>'> <?php echo $lang->story->assignedTo;?></th>
           <th class='c-source<?php echo zget($visibleFields, 'source', ' hidden')?>'> <?php echo $lang->story->source;?></th>
           <th class='c-note<?php echo zget($visibleFields, 'source', ' hidden')?>'> <?php echo $lang->story->sourceNote;?></th>
diff --git a/module/story/view/bugs.html.php b/module/story/view/bugs.html.php
index 9edbb6ed71..8101b47228 100644
--- a/module/story/view/bugs.html.php
+++ b/module/story/view/bugs.html.php
@@ -12,7 +12,7 @@
         <tr class='text-center'>
           <th class='c-id'>        <?php echo $lang->idAB;?></th>
           <th class='w-p30'>       <?php echo $lang->bug->title;?></th>
-          <th class='c-pri'>       <?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->story->pri;?>><?php echo $lang->priAB;?></th>
           <th class='c-type'>      <?php echo $lang->bug->type;?></th>
           <th class='c-status'>    <?php echo $lang->statusAB;?></th>
           <th class='c-user'>      <?php echo $lang->bug->assignedTo;?></th>
diff --git a/module/story/view/cases.html.php b/module/story/view/cases.html.php
index 154e24dcf9..d36a419aef 100644
--- a/module/story/view/cases.html.php
+++ b/module/story/view/cases.html.php
@@ -12,7 +12,7 @@
         <tr class='text-center'>
           <th class='c-id'>    <?php echo $lang->idAB;?></th>
           <th class='w-p30'>   <?php echo $lang->testcase->title;?></th>
-          <th class='c-pri'>   <?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->story->pri;?>><?php echo $lang->priAB;?></th>
           <th class='c-type'>  <?php echo $lang->testcase->type;?></th>
           <th class='c-status'><?php echo $lang->statusAB;?></th>
           <th class='c-user'>  <?php echo $lang->testcase->lastRunner;?></th>
diff --git a/module/story/view/linkstory.html.php b/module/story/view/linkstory.html.php
index 0260e58510..3c9d8effda 100644
--- a/module/story/view/linkstory.html.php
+++ b/module/story/view/linkstory.html.php
@@ -35,7 +35,7 @@
           </div>
           <?php echo $lang->idAB;?>
         </th>
-        <th class='c-pri'><?php echo $lang->priAB;?></th>
+        <th class='c-pri' title=<?php echo $lang->story->pri;?>><?php echo $lang->priAB;?></th>
         <th><?php echo $lang->story->title;?></th>
         <th class='c-status'><?php echo $lang->story->status;?></th>
         <?php if($story->type == 'requirement'):?>
diff --git a/module/story/view/tasks.html.php b/module/story/view/tasks.html.php
index 64ef8d78a9..8f6d580a05 100644
--- a/module/story/view/tasks.html.php
+++ b/module/story/view/tasks.html.php
@@ -15,7 +15,7 @@ include '../../common/view/chart.html.php';
         <tr class='text-center'>
           <th class='c-id'>      <?php echo $lang->idAB;?></th>
           <th class='w-p30'>     <?php echo $lang->task->name;?></th>
-          <th class='c-pri'>     <?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->story->pri;?>><?php echo $lang->priAB;?></th>
           <th class='c-status'>  <?php echo $lang->statusAB;?></th>
           <th class='c-user'>    <?php echo $lang->task->assignedToAB;?></th>
           <th class='c-estimate'><?php echo $lang->task->estimateAB;?></th>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 16be21d237..553e702396 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -150,7 +150,7 @@
             <thead>
               <tr class='text-center'>
                 <th class='w-50px'> <?php echo $lang->story->id;?></th>
-                <th class='w-40px'> <?php echo $lang->priAB;?></th>
+                <th class='w-40px' title=<?php echo $lang->story->pri;?>><?php echo $lang->priAB;?></th>
                 <th>                <?php echo $lang->story->title;?></th>
                 <th class='w-100px'><?php echo $lang->story->assignedTo;?></th>
                 <th class='w-90px'> <?php echo $lang->story->estimate;?></th>
diff --git a/module/story/view/zerocase.html.php b/module/story/view/zerocase.html.php
index e90d63132c..cab2b83887 100644
--- a/module/story/view/zerocase.html.php
+++ b/module/story/view/zerocase.html.php
@@ -33,7 +33,7 @@
           </div>
           <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
         </th>
-        <th class='c-pri'>     <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+        <th class='c-pri' title=<?php echo $lang->story->pri;?>><?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
         <th class='w-p30'>     <?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
         <th>                   <?php common::printOrderLink('plan',       $orderBy, $vars, $lang->story->planAB);?></th>
         <th class='thWidth'>   <?php common::printOrderLink('source',     $orderBy, $vars, $lang->story->source);?></th>

From aa444513d6a5e6db7bd1fac27177795752874f59 Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Thu, 17 Feb 2022 16:13:24 +0800
Subject: [PATCH 02/12] * Finish task 49283.

---
 module/bug/config.php      | 1 +
 module/story/config.php    | 1 +
 module/task/config.php     | 1 +
 module/testcase/config.php | 1 +
 4 files changed, 4 insertions(+)

diff --git a/module/bug/config.php b/module/bug/config.php
index 034f24bc42..df5a1739bf 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -167,6 +167,7 @@ $config->bug->datatable->fieldList['pri']['title']    = 'P';
 $config->bug->datatable->fieldList['pri']['fixed']    = 'left';
 $config->bug->datatable->fieldList['pri']['width']    = '50';
 $config->bug->datatable->fieldList['pri']['required'] = 'no';
+$config->bug->datatable->fieldList['pri']['name']     = $lang->bug->pri;
 
 $config->bug->datatable->fieldList['confirmed']['title']    = 'confirmedAB';
 $config->bug->datatable->fieldList['confirmed']['fixed']    = 'left';
diff --git a/module/story/config.php b/module/story/config.php
index 67bec65085..616c9c9126 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -60,6 +60,7 @@ $config->story->datatable->fieldList['pri']['title']    = 'priAB';
 $config->story->datatable->fieldList['pri']['fixed']    = 'left';
 $config->story->datatable->fieldList['pri']['width']    = '50';
 $config->story->datatable->fieldList['pri']['required'] = 'no';
+$config->story->datatable->fieldList['pri']['name']     = $this->lang->story->pri;
 
 $config->story->datatable->fieldList['title']['title']    = 'title';
 $config->story->datatable->fieldList['title']['fixed']    = 'left';
diff --git a/module/task/config.php b/module/task/config.php
index 17bb90c08f..c5baf56e79 100644
--- a/module/task/config.php
+++ b/module/task/config.php
@@ -60,6 +60,7 @@ $config->task->datatable->fieldList['pri']['title']    = 'priAB';
 $config->task->datatable->fieldList['pri']['fixed']    = 'left';
 $config->task->datatable->fieldList['pri']['width']    = '50';
 $config->task->datatable->fieldList['pri']['required'] = 'no';
+$config->task->datatable->fieldList['pri']['name']     = $lang->task->pri;
 
 $config->task->datatable->fieldList['name']['title']    = 'name';
 $config->task->datatable->fieldList['name']['fixed']    = 'left';
diff --git a/module/testcase/config.php b/module/testcase/config.php
index be18fd7b87..74c780eb55 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -87,6 +87,7 @@ $config->testcase->datatable->fieldList['pri']['title']    = 'priAB';
 $config->testcase->datatable->fieldList['pri']['fixed']    = 'left';
 $config->testcase->datatable->fieldList['pri']['width']    = '40';
 $config->testcase->datatable->fieldList['pri']['required'] = 'no';
+$config->testcase->datatable->fieldList['pri']['name']     = $lang->testcase->pri;
 
 $config->testcase->datatable->fieldList['title']['title']    = 'title';
 $config->testcase->datatable->fieldList['title']['fixed']    = 'left';

From 22f29fd8d4afe3019c323ed8db0f27dbf6efa7e9 Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Fri, 18 Feb 2022 10:40:09 +0800
Subject: [PATCH 03/12] *Fix bug 49283

---
 db/update16.4.sql                       | 23 +++++++++++++++++++++++
 module/my/lang/en.php                   |  1 +
 module/my/lang/zh-cn.php                |  1 +
 module/my/view/story.html.php           |  2 +-
 module/testcase/view/groupcase.html.php |  2 +-
 module/testsuite/lang/en.php            |  1 +
 module/testsuite/lang/zh-cn.php         |  1 +
 module/testsuite/view/view.html.php     |  2 +-
 8 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 db/update16.4.sql

diff --git a/db/update16.4.sql b/db/update16.4.sql
new file mode 100644
index 0000000000..aecc125c66
--- /dev/null
+++ b/db/update16.4.sql
@@ -0,0 +1,23 @@
+ALTER TABLE `zt_userquery` ADD`common` enum('0','1') NOT NULL DEFAULT '0';
+
+ALTER TABLE `zt_project` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `order`;
+ALTER TABLE `zt_product` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `order`;
+ALTER TABLE `zt_task` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `deleted`;
+ALTER TABLE `zt_projectstory` ADD INDEX `story` (`story`);
+ALTER TABLE `zt_group` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `project`;
+ALTER TABLE `zt_lang` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `system`;
+ALTER TABLE `zt_lang` DROP INDEX `lang`, ADD UNIQUE `lang` (`lang`,`module`,`section`,`key`,`vision`);
+ALTER TABLE `zt_doc` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`;
+ALTER TABLE `zt_doclib` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `type`;
+ALTER TABLE `zt_action` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `read`;
+ALTER TABLE `zt_searchindex` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`;
+ALTER TABLE `zt_config` ADD `vision` varchar(10) NOT NULL DEFAULT '' AFTER `id`;
+ALTER TABLE `zt_config` DROP INDEX `unique`, ADD UNIQUE `unique` (`vision`,`owner`,`module`,`section`,`key`);
+ALTER TABLE `zt_todo` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `deleted`;
+ALTER TABLE `zt_block` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `account`;
+ALTER TABLE `zt_block` DROP INDEX `account_module_type_order`, ADD UNIQUE `account_vision_module_type_order` (`account`, `vision`, `module`, `type`, `order`);
+ALTER TABLE `zt_effort` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`;
+ALTER TABLE `zt_story` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`;
+
+ALTER TABLE `zt_user` ADD `visions` varchar(20) NOT NULL AFTER `visits`;
+UPDATE `zt_user` SET `visions`='rnd,lite';
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index d40d1fe11a..b2cb72f428 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -41,6 +41,7 @@ $lang->my->requirement     = "My {$lang->URCommon}";
 $lang->my->testtask        = 'My Test Task';
 $lang->my->testcase        = 'My Case';
 $lang->my->storyConcept    = 'Story Concept';
+$lang->my->pri             = 'Priority';
 
 $lang->my->indexAction      = 'My Index';
 $lang->my->calendarAction   = 'My Calendar';
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index f0fa0775d2..5de4dcf78e 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -41,6 +41,7 @@ $lang->my->requirement     = "我的{$lang->URCommon}";
 $lang->my->testtask        = '我的测试单';
 $lang->my->testcase        = '我的用例';
 $lang->my->storyConcept    = $config->URAndSR ? '默认需求概念组合' : '默认需求概念';
+$lang->my->pri             = '优先级';
 
 $lang->my->indexAction      = '地盘仪表盘';
 $lang->my->calendarAction   = '我的日程';
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index dd6b6ece46..d410598f76 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -58,7 +58,7 @@
             <?php endif;?>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
-          <th class='c-pri' title=<?php echo $lang->task->pri;?>><?php common::printOrderLink('pri',          $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri' title=<?php echo $lang->my->pri;?>><?php common::printOrderLink('pri',          $orderBy, $vars, $lang->priAB);?></th>
           <th class='c-name'>     <?php common::printOrderLink('title',        $orderBy, $vars, $lang->my->name);?></th>
           <th class='c-product'>  <?php common::printOrderLink('productTitle', $orderBy, $vars, $lang->story->product);?></th>
           <th class='c-plan'>     <?php common::printOrderLink('plan',         $orderBy, $vars, $lang->story->plan);?></th>
diff --git a/module/testcase/view/groupcase.html.php b/module/testcase/view/groupcase.html.php
index e863be5027..e0f3adfddb 100644
--- a/module/testcase/view/groupcase.html.php
+++ b/module/testcase/view/groupcase.html.php
@@ -35,7 +35,7 @@
           </div>
         </th>
         <th class='c-id-sm'><?php echo $lang->idAB;?></th>
-        <th class='c-pri'>  <?php echo $lang->priAB;?></th>
+        <th class='c-pri' title=<?php echo $lang->testcase->pri;?>>  <?php echo $lang->priAB;?></th>
         <th class='c-title text-left'><?php echo $lang->testcase->title;?></th>
         <th class='c-type'> <?php echo $lang->typeAB;?></th>
         <th class='c-user'> <?php echo $lang->testtask->lastRunAccount;?></th>
diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php
index 0b64a3e23d..3171bf426d 100644
--- a/module/testsuite/lang/en.php
+++ b/module/testsuite/lang/en.php
@@ -24,6 +24,7 @@ $lang->testsuite->deleted          = 'Deleted';
 $lang->testsuite->successSaved     = 'Saved';
 
 $lang->testsuite->id             = 'ID';
+$lang->testsuite->pri            = 'Priority';
 $lang->testsuite->common         = 'Test Suite';
 $lang->testsuite->project        = 'Project';
 $lang->testsuite->product        = $lang->productCommon;
diff --git a/module/testsuite/lang/zh-cn.php b/module/testsuite/lang/zh-cn.php
index 1103d4f9eb..349fe18e86 100644
--- a/module/testsuite/lang/zh-cn.php
+++ b/module/testsuite/lang/zh-cn.php
@@ -24,6 +24,7 @@ $lang->testsuite->deleted          = '已删除';
 $lang->testsuite->successSaved     = '保存成功';
 
 $lang->testsuite->id             = '编号';
+$lang->testsuite->pri            = '优先级';
 $lang->testsuite->common         = '套件';
 $lang->testsuite->project        = '所属项目';
 $lang->testsuite->product        = '所属' . $lang->productCommon;
diff --git a/module/testsuite/view/view.html.php b/module/testsuite/view/view.html.php
index 7c5c3d60d5..f4962e9033 100644
--- a/module/testsuite/view/view.html.php
+++ b/module/testsuite/view/view.html.php
@@ -60,7 +60,7 @@
                 <?php endif;?>
                 <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></nobr>
               </th>
-              <th class='c-pri w-50px'><?php common::printOrderLink('pri',     $orderBy, $vars, $lang->priAB);?></th>
+              <th class='c-pri w-50px' title=<?php echo $lang->testsuite->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
               <th class='w-100px'><?php common::printOrderLink('module',       $orderBy, $vars, $lang->testcase->module);?></th>
               <th class='c-name'><?php common::printOrderLink('title',         $orderBy, $vars, $lang->testcase->title);?></th>
               <th class='w-90px'><?php common::printOrderLink('type',          $orderBy, $vars, $lang->testcase->type);?></th>

From 0805d2573592d696a959cbefe8b56bda1c9ae717 Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Mon, 21 Feb 2022 10:47:27 +0800
Subject: [PATCH 04/12] * Finish task 49283.

---
 module/bug/view/linkbugs.html.php             | 2 +-
 module/build/view/linkbug.html.php            | 2 +-
 module/build/view/linkstory.html.php          | 2 +-
 module/build/view/view.html.php               | 2 +-
 module/caselib/view/browse.html.php           | 2 +-
 module/common/lang/en.php                     | 2 ++
 module/common/lang/zh-cn.php                  | 2 ++
 module/kanban/view/importcard.html.php        | 2 +-
 module/mr/view/link.html.php                  | 6 +++---
 module/mr/view/linkbug.html.php               | 2 +-
 module/mr/view/linkstory.html.php             | 2 +-
 module/mr/view/linktask.html.php              | 2 +-
 module/productplan/view/linkbug.html.php      | 2 +-
 module/productplan/view/linkstory.html.php    | 2 +-
 module/productplan/view/view.html.php         | 8 ++++----
 module/projectrelease/view/linkbug.html.php   | 2 +-
 module/projectrelease/view/linkstory.html.php | 2 +-
 module/projectrelease/view/view.html.php      | 2 +-
 module/release/view/linkbug.html.php          | 2 +-
 module/release/view/linkstory.html.php        | 2 +-
 module/release/view/view.html.php             | 2 +-
 module/testcase/view/bugs.html.php            | 2 +-
 module/testcase/view/importfromlib.html.php   | 4 ++--
 module/testcase/view/linkcases.html.php       | 2 +-
 module/testsuite/view/linkcase.html.php       | 2 +-
 module/testtask/view/groupcase.html.php       | 2 +-
 module/testtask/view/linkcase.html.php        | 2 +-
 module/testtask/view/unitgroup.html.php       | 2 +-
 module/user/view/bug.html.php                 | 2 +-
 module/user/view/story.html.php               | 2 +-
 module/user/view/task.html.php                | 2 +-
 module/user/view/testcase.html.php            | 2 +-
 module/user/view/todo.html.php                | 2 +-
 33 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/module/bug/view/linkbugs.html.php b/module/bug/view/linkbugs.html.php
index b3ec18fa85..7ead53687b 100644
--- a/module/bug/view/linkbugs.html.php
+++ b/module/bug/view/linkbugs.html.php
@@ -32,7 +32,7 @@
             </div>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->bug->product;?></th>
           <th><?php echo $lang->bug->title;?></th>
           <th class='c-status'><?php echo $lang->bug->statusAB;?></th>
diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php
index b4364e65d8..bdd39c2c5a 100644
--- a/module/build/view/linkbug.html.php
+++ b/module/build/view/linkbug.html.php
@@ -27,7 +27,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-status'> <?php echo $lang->priAB;?></th>
+          <th class='c-status' title=<?php echo $lang->pri;?>> <?php echo $lang->priAB;?></th>
           <th class='text-left'><?php echo $lang->bug->title;?></th>
           <th class='c-user'>   <?php echo $lang->openedByAB;?></th>
           <th class='c-user'>   <?php echo $lang->bug->resolvedBy;?></th>
diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php
index 3ce47e1e51..d874361a28 100644
--- a/module/build/view/linkstory.html.php
+++ b/module/build/view/linkstory.html.php
@@ -27,7 +27,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'>    <?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th class="text-left"><?php echo $lang->story->title;?></th>
           <th class='c-user'>   <?php echo $lang->openedByAB;?></th>
           <th class='c-user'>   <?php echo $lang->assignedToAB;?></th>
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index d10b01c3e0..d23b4ea3ae 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -89,7 +89,7 @@ tbody tr td:first-child input {display: none;}
                   <?php endif;?>
                   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </th>
-                <th class='c-id'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+                <th class='c-id' title=<?php echo $lang->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                 <th class='text-left'><?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
                 <th class='c-user'><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
                 <th class='c-id text-right'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
diff --git a/module/caselib/view/browse.html.php b/module/caselib/view/browse.html.php
index e4e94f5217..5fc8f8174d 100644
--- a/module/caselib/view/browse.html.php
+++ b/module/caselib/view/browse.html.php
@@ -124,7 +124,7 @@ js::set('flow',          $config->global->flow);
                 <?php endif;?>
                 <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
               </th>
-              <th class='c-pri'>   <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
+              <th class='c-pri' title=<?php echo $lang->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
               <th class='text-left'><?php common::printOrderLink('title',   $orderBy, $vars, $lang->testcase->title);?></th>
               <th class='c-type'>  <?php common::printOrderLink('type',     $orderBy, $vars, $lang->typeAB);?></th>
               <th class='c-user'>  <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index e6fdabf436..9849859a23 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -145,6 +145,8 @@ $lang->assignedToAB = 'AssignedTo';
 $lang->typeAB       = 'Type';
 $lang->nameAB       = 'Name';
 
+$lang->pri = 'Priority';
+
 $lang->common->common     = 'Common Module';
 $lang->my->common         = 'My';
 $lang->program->common    = 'Program';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 2bd0ba479d..0c99f1773e 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -145,6 +145,8 @@ $lang->assignedToAB = '指派';
 $lang->typeAB       = '类型';
 $lang->nameAB       = '名称';
 
+$lang->pri = '优先级';
+
 $lang->common->common     = '公有模块';
 $lang->my->common         = '地盘';
 $lang->program->common    = '项目集';
diff --git a/module/kanban/view/importcard.html.php b/module/kanban/view/importcard.html.php
index 15a8441a92..98c28ea56f 100644
--- a/module/kanban/view/importcard.html.php
+++ b/module/kanban/view/importcard.html.php
@@ -40,7 +40,7 @@
             <?php echo $lang->idAB;?>
           </th>
           <th class='c-name'><?php echo $lang->kanban->name;?></th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th class='c-name'><?php echo $lang->kanbancard->name;?></th>
           <th class='c-user'><?php echo $lang->kanbancard->assignedTo;?></th>
           <th class='c-date'><?php echo $lang->kanbancard->end;?></th>
diff --git a/module/mr/view/link.html.php b/module/mr/view/link.html.php
index 65d7a17826..86411732ed 100644
--- a/module/mr/view/link.html.php
+++ b/module/mr/view/link.html.php
@@ -72,7 +72,7 @@
                 <?php if($canOrder):?>
                 <th class='w-70px'><?php common::printOrderLink('order', $orderBy, $vars, $lang->productplan->updateOrder);?></th>
                 <?php endif;?>
-                <th class='w-70px'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+                <th class='w-70px' title=<?php echo $lang->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                 <th class='w-150px text-left'><?php common::printOrderLink('module',     $orderBy, $vars, $lang->story->module);?></th>
                 <th class='text-left'><?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
                 <th class='c-user'> <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
@@ -153,7 +153,7 @@
                 <th class='c-id text-left'>
                   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </th>
-                <th class='w-70px'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+                <th class='w-70px' title=<?php echo $lang->pri;?>> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                 <th class='text-left'><?php common::printOrderLink('title',      $orderBy, $vars, $lang->bug->title);?></th>
                 <th class='c-user'> <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
                 <th class='c-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->bug->assignedToAB);?></th>
@@ -215,7 +215,7 @@
                 <th class='c-id text-left'>
                   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </th>
-                <th class='w-70px'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+                <th class='w-70px' title=<?php echo $lang->pri;?>> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                 <th class='text-left'><?php common::printOrderLink('name',      $orderBy, $vars, $lang->task->name);?></th>
                 <th class='c-user'> <?php common::printOrderLink('finishedBy',   $orderBy, $vars, $lang->task->finishedByAB);?></th>
                 <th class='c-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->task->assignedToAB);?></th>
diff --git a/module/mr/view/linkbug.html.php b/module/mr/view/linkbug.html.php
index 49daaa7865..e070284cb2 100644
--- a/module/mr/view/linkbug.html.php
+++ b/module/mr/view/linkbug.html.php
@@ -27,7 +27,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th class='text-left'><?php echo $lang->bug->title;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
           <th class='c-user'><?php echo $lang->bug->assignedToAB;?></th>
diff --git a/module/mr/view/linkstory.html.php b/module/mr/view/linkstory.html.php
index 9d334b9bdc..e12ac68d2f 100644
--- a/module/mr/view/linkstory.html.php
+++ b/module/mr/view/linkstory.html.php
@@ -27,7 +27,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th class='c-plan'><?php echo $lang->story->plan;?></th>
           <th class='c-module'><?php echo $lang->story->module;?></th>
           <th class='text-left'><?php echo $lang->story->title;?></th>
diff --git a/module/mr/view/linktask.html.php b/module/mr/view/linktask.html.php
index e231dee43e..a22da0aeec 100644
--- a/module/mr/view/linktask.html.php
+++ b/module/mr/view/linktask.html.php
@@ -27,7 +27,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th class='text-left'><?php echo $lang->task->name;?></th>
           <th class='c-user'><?php echo $lang->task->finishedByAB;?></th>
           <th class='c-user'><?php echo $lang->task->assignedToAB;?></th>
diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php
index 2b235ca1f4..5468ec1fd4 100644
--- a/module/productplan/view/linkbug.html.php
+++ b/module/productplan/view/linkbug.html.php
@@ -27,7 +27,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title='<?php echo $lang->pri;?>'><?php echo $lang->priAB;?></th>
           <th class='text-left'><?php echo $lang->bug->title;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
           <th class='c-user'><?php echo $lang->bug->assignedToAB;?></th>
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index c026b12eef..b2c29697fc 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -27,7 +27,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title='<?php echo $lang->pri;?>'><?php echo $lang->priAB;?></th>
           <th class='c-plan'><?php echo $lang->story->plan;?></th>
           <th class='c-module'><?php echo $lang->story->module;?></th>
           <th class='text-left'><?php echo $lang->story->title;?></th>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index e842979fa6..e306c8034e 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -157,7 +157,7 @@
                 <th class='c-id text-left'>
                   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </th>
-                <th class='w-70px'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+                <th class='w-70px' title='<?php echo $lang->pri;?>'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
                 <th class='text-left'><?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
                 <th class='w-70px'> <?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
                 <?php else:?>
@@ -172,7 +172,7 @@
                 <?php if($canOrder):?>
                 <th class='w-70px'><?php common::printOrderLink('order', $orderBy, $vars, $lang->productplan->updateOrder);?></th>
                 <?php endif;?>
-                <th class='w-70px'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+                <th class='w-70px' title='<?php echo $lang->pri;?>'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                 <th class='w-150px text-left'><?php common::printOrderLink('module',     $orderBy, $vars, $lang->story->module);?></th>
                 <th class='text-left'><?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
                 <th class='c-user'> <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
@@ -452,7 +452,7 @@
                 <th class='c-id text-left'>
                   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </th>
-                <th class='w-70px'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+                <th class='w-70px' title='<?php echo $lang->pri;?>'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
                 <th class='text-left'><?php common::printOrderLink('title',    $orderBy, $vars, $lang->bug->title);?></th>
                 <th class='w-100px'><?php common::printOrderLink('status',     $orderBy, $vars, $lang->bug->status);?></th>
                 <?php else:?>
@@ -464,7 +464,7 @@
                   <?php endif;?>
                   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </th>
-                <th class='w-70px'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+                <th class='w-70px' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                 <th class='text-left'><?php common::printOrderLink('title',    $orderBy, $vars, $lang->bug->title);?></th>
                 <th class='c-user'> <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
                 <th class='c-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->bug->assignedToAB);?></th>
diff --git a/module/projectrelease/view/linkbug.html.php b/module/projectrelease/view/linkbug.html.php
index a5b8652488..9ed6c81f62 100644
--- a/module/projectrelease/view/linkbug.html.php
+++ b/module/projectrelease/view/linkbug.html.php
@@ -31,7 +31,7 @@ $formID      = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title='<?php echo $lang->pri;?>'><?php echo $lang->priAB;?></th>
           <th class='text-left'><?php echo $lang->bug->title;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
           <th class='c-user'><?php echo $lang->bug->resolvedBy;?></th>
diff --git a/module/projectrelease/view/linkstory.html.php b/module/projectrelease/view/linkstory.html.php
index f75c38af81..c6caa3ac06 100644
--- a/module/projectrelease/view/linkstory.html.php
+++ b/module/projectrelease/view/linkstory.html.php
@@ -27,7 +27,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title='<?php echo $lang->pri;?>'><?php echo $lang->priAB;?></th>
           <th class='text-left'><?php echo $lang->story->title;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
           <th class='c-user'><?php echo $lang->assignedToAB;?></th>
diff --git a/module/projectrelease/view/view.html.php b/module/projectrelease/view/view.html.php
index 0ebf95a796..3dc3c86f29 100644
--- a/module/projectrelease/view/view.html.php
+++ b/module/projectrelease/view/view.html.php
@@ -85,7 +85,7 @@
                       <?php endif;?>
                       <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                     </th>
-                    <th class='c-pri'>    <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
+                    <th class='c-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                     <th class="text-left"><?php common::printOrderLink('title',    $orderBy, $vars, $lang->story->title);?></th>
                     <th class='c-user'>   <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
                     <th class='w-80px text-right'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
diff --git a/module/release/view/linkbug.html.php b/module/release/view/linkbug.html.php
index 874436fbd0..ac3effbfe9 100644
--- a/module/release/view/linkbug.html.php
+++ b/module/release/view/linkbug.html.php
@@ -31,7 +31,7 @@ $formID      = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th class='text-left'><?php echo $lang->bug->title;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
           <th class='c-user'><?php echo $lang->bug->resolvedBy;?></th>
diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php
index c8d9ca1e8f..0b10f22482 100644
--- a/module/release/view/linkstory.html.php
+++ b/module/release/view/linkstory.html.php
@@ -27,7 +27,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th class='text-left'><?php echo $lang->story->title;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
           <th class='c-user'><?php echo $lang->assignedToAB;?></th>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index cb7b8bc7d0..1c41e9bc21 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -85,7 +85,7 @@
                       <?php endif;?>
                       <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                     </th>
-                    <th class='c-pri'>    <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
+                    <th class='c-pri' title=<?php echo $lang->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                     <th class="text-left"><?php common::printOrderLink('title',    $orderBy, $vars, $lang->story->title);?></th>
                     <th class='c-user'>   <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
                     <th class='w-80px text-right'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
diff --git a/module/testcase/view/bugs.html.php b/module/testcase/view/bugs.html.php
index 84da9259f5..93e36b1534 100644
--- a/module/testcase/view/bugs.html.php
+++ b/module/testcase/view/bugs.html.php
@@ -9,7 +9,7 @@
         <tr class='text-center'>
           <th class='c-id'><?php echo $lang->idAB;?></th>
           <th class='w-p30'> <?php echo $lang->bug->title;?></th>
-          <th class='c-pri'> <?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th class='c-type'><?php echo $lang->bug->type;?></th>
           <th class='c-status'><?php echo $lang->statusAB;?></th>
           <th class='c-user'><?php echo $lang->bug->assignedTo;?></th>
diff --git a/module/testcase/view/importfromlib.html.php b/module/testcase/view/importfromlib.html.php
index df10fd4979..c0e7e814b8 100644
--- a/module/testcase/view/importfromlib.html.php
+++ b/module/testcase/view/importfromlib.html.php
@@ -36,8 +36,8 @@
           <?php if($product->type != 'normal'):?>
           <th class='c-branch'><?php echo $lang->testcase->branch ?></th>
           <?php endif;?>
-          <th class='c-pri'>  <?php common::printOrderLink('pri',   $orderBy, $vars, $lang->priAB);?></th>
-          <th>                <?php common::printOrderLink('title', $orderBy, $vars, $lang->testcase->title);?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php common::printOrderLink('pri',   $orderBy, $vars, $lang->priAB);?></th>
+          <th><?php common::printOrderLink('title', $orderBy, $vars, $lang->testcase->title);?></th>
           <th class='c-module'><?php echo $lang->testcase->fromModule ?></th>
           <th class='c-module'><?php echo $lang->testcase->module ?></th>
           <th class='c-type'><?php common::printOrderLink('type',  $orderBy, $vars, $lang->testcase->type)?></th>
diff --git a/module/testcase/view/linkcases.html.php b/module/testcase/view/linkcases.html.php
index 0bd00d0d17..ab5e4db49f 100644
--- a/module/testcase/view/linkcases.html.php
+++ b/module/testcase/view/linkcases.html.php
@@ -32,7 +32,7 @@
             </div>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->testcase->product;?></th>
           <th><?php echo $lang->testcase->title;?></th>
           <th class='c-type'><?php echo $lang->testcase->type;?></th>
diff --git a/module/testsuite/view/linkcase.html.php b/module/testsuite/view/linkcase.html.php
index 1324d49758..67dced905a 100644
--- a/module/testsuite/view/linkcase.html.php
+++ b/module/testsuite/view/linkcase.html.php
@@ -40,7 +40,7 @@
             <?php echo $lang->idAB;?>
           </th>
           <th class='w-70px text-center'><nobr><?php echo $lang->testsuite->linkVersion;?></nobr></th>
-          <th class='w-70px'><?php echo $lang->priAB;?></th>
+          <th class='w-70px' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->testcase->title;?></th>
           <th class='w-90px'><?php echo $lang->testcase->type;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
diff --git a/module/testtask/view/groupcase.html.php b/module/testtask/view/groupcase.html.php
index b5af67b4ab..2e5857f15f 100644
--- a/module/testtask/view/groupcase.html.php
+++ b/module/testtask/view/groupcase.html.php
@@ -26,7 +26,7 @@
           </div>
         </th>
         <th class='c-id-sm'><?php echo $lang->idAB;?></th>
-        <th class='w-80px'>  <?php echo $lang->priAB;?></th>
+        <th class='w-80px' title='<?php echo $lang->pri;?>'>  <?php echo $lang->priAB;?></th>
         <th><?php echo $lang->testcase->title;?></th>
         <th class='w-80px'> <?php echo $lang->typeAB;?></th>
         <th class='w-user'> <?php echo $lang->testtask->assignedTo;?></th>
diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php
index 4b58c7ff0f..f2a0a97316 100644
--- a/module/testtask/view/linkcase.html.php
+++ b/module/testtask/view/linkcase.html.php
@@ -84,7 +84,7 @@
             <?php echo $lang->idAB;?>
           </th>
           <th class='c-version text-center'><nobr><?php echo $lang->testtask->linkVersion;?></nobr></th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title='<?php echo $lang->pri;?>'><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->testcase->title;?></th>
           <th class='c-type'><?php echo $lang->testcase->type;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
diff --git a/module/testtask/view/unitgroup.html.php b/module/testtask/view/unitgroup.html.php
index 9b4bed3164..b27448e517 100644
--- a/module/testtask/view/unitgroup.html.php
+++ b/module/testtask/view/unitgroup.html.php
@@ -15,7 +15,7 @@
         </div>
       </th>
       <th class='c-id-sm'><?php echo $lang->idAB;?></th>
-      <th class='w-pri'>  <?php echo $lang->priAB;?></th>
+      <th class='w-pri' title='<?php echo $lang->pri;?>'>  <?php echo $lang->priAB;?></th>
       <th><?php echo $lang->testcase->title;?></th>
       <th class='w-80px'> <?php echo $lang->testtask->lastRunAccount;?></th>
       <th class='w-120px'><?php echo $lang->testtask->lastRunTime;?></th>
diff --git a/module/user/view/bug.html.php b/module/user/view/bug.html.php
index 7543feadf9..08d097a804 100644
--- a/module/user/view/bug.html.php
+++ b/module/user/view/bug.html.php
@@ -40,7 +40,7 @@
         <tr class='text-center'>
           <th class='c-id'>        <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
           <th class='c-severity'>  <?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
-          <th class='c-pri'>       <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
           <th class='c-type'>      <?php common::printOrderLink('type', $orderBy, $vars, $lang->typeAB);?></th>
           <th class='text-left'>   <?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
           <th class='c-user'>      <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
diff --git a/module/user/view/story.html.php b/module/user/view/story.html.php
index 6968bf2550..6cdab3107f 100644
--- a/module/user/view/story.html.php
+++ b/module/user/view/story.html.php
@@ -42,7 +42,7 @@
       <thead>
         <tr class='colhead'>
           <th class='w-id'>   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
-          <th class='w-pri'>  <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+          <th class='w-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
           <th class='w-200px'><?php common::printOrderLink('product', $orderBy, $vars, $lang->story->product);?></th>
           <th>                <?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
           <?php if($storyType != 'requirement'):?>
diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php
index 1c6f51ab38..c52df556c1 100644
--- a/module/user/view/task.html.php
+++ b/module/user/view/task.html.php
@@ -42,7 +42,7 @@
       <thead>
         <tr class='colhead'>
           <th class='w-id'><?php echo $lang->idAB;?></th>
-          <th class='w-pri'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+          <th class='w-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
           <th><?php common::printOrderLink('execution', $orderBy, $vars, $lang->task->execution);?></th>
           <th><?php common::printOrderLink('name', $orderBy, $vars, $lang->task->name);?></th>
           <th class='w-70px hours'><?php echo $lang->task->estimateAB;?></th>
diff --git a/module/user/view/testcase.html.php b/module/user/view/testcase.html.php
index dbecfbcd54..9e3cb8914f 100755
--- a/module/user/view/testcase.html.php
+++ b/module/user/view/testcase.html.php
@@ -35,7 +35,7 @@
       <thead>
         <tr class='colhead'>
           <th class='c-id'>    <?php common::printOrderLink('id',       $orderBy, $vars, $lang->idAB);?></th>
-          <th class='c-pri'>   <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
           <th>                 <?php common::printOrderLink('title',    $orderBy, $vars, $lang->testcase->title);?></th>
           <th class='c-type'>  <?php common::printOrderLink('type',     $orderBy, $vars, $lang->typeAB);?></th>
           <th class='c-user'>  <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
diff --git a/module/user/view/todo.html.php b/module/user/view/todo.html.php
index 6abf82aebc..2fd685e39a 100644
--- a/module/user/view/todo.html.php
+++ b/module/user/view/todo.html.php
@@ -38,7 +38,7 @@
         <th class='c-id'>    <?php common::printOrderLink('id',     $orderBy, $vars, $lang->idAB);?></th>
         <th class='c-date'>  <?php common::printOrderLink('date',   $orderBy, $vars, $lang->todo->date);?></th>
         <th class='c-type'>  <?php common::printOrderLink('type',   $orderBy, $vars, $lang->todo->type);?></th>
-        <th class='c-pri'>   <?php common::printOrderLink('pri',    $orderBy, $vars, $lang->priAB);?></th>
+        <th class='c-pri' title='<?php echo $lang->pri;?>'>   <?php common::printOrderLink('pri',    $orderBy, $vars, $lang->priAB);?></th>
         <th>                 <?php common::printOrderLink('name',   $orderBy, $vars, $lang->todo->name);?></th>
         <th class='c-date'>  <?php common::printOrderLink('begin',  $orderBy, $vars, $lang->todo->beginAB);?></th>
         <th class='c-date'>  <?php common::printOrderLink('end',    $orderBy, $vars, $lang->todo->endAB);?></th>

From a9995c6fe018db8d190162bb13f9624f21a94107 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Tue, 22 Feb 2022 09:00:47 +0000
Subject: [PATCH 05/12] Finish task #49692.

---
 module/kanban/control.php             | 27 +++++++++++++++++++++++----
 module/kanban/js/editspace.js         | 11 +++++++++++
 module/kanban/lang/en.php             |  4 ++++
 module/kanban/lang/zh-cn.php          |  4 ++++
 module/kanban/model.php               | 19 ++++++++++++++++++-
 module/kanban/view/editspace.html.php | 11 ++++++++---
 6 files changed, 68 insertions(+), 8 deletions(-)
 create mode 100644 module/kanban/js/editspace.js

diff --git a/module/kanban/control.php b/module/kanban/control.php
index 2d38f69ff4..b5d71d7d0c 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -74,12 +74,12 @@ class kanban extends control
      * @access public
      * @return void
      */
-    public function editSpace($spaceID)
+    public function editSpace($spaceID, $type = '')
     {
         $this->loadModel('action');
         if(!empty($_POST))
         {
-            $changes = $this->kanban->updateSpace($spaceID);
+            $changes = $this->kanban->updateSpace($spaceID, $type);
 
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
@@ -89,8 +89,27 @@ class kanban extends control
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
         }
 
-        $this->view->space = $this->kanban->getSpaceById($spaceID);
-        $this->view->users = $this->loadModel('user')->getPairs('noclosed');
+        $space = $this->kanban->getSpaceById($spaceID);
+
+        $typeList = $this->lang->kanbanspace->typeList;
+        if($space->type == 'cooperation' or $space->type == 'public') unset($typeList['private']);
+
+        if($space->type == 'private' and ($type == 'cooperation' or $type == 'public'))
+        {
+            $team = $space->whitelist;
+        }
+        else
+        {
+            $team = $space->team;
+        }
+
+        $this->view->spaceID     = $spaceID;
+        $this->view->space       = $space;
+        $this->view->users       = $this->loadModel('user')->getPairs('noclosed');
+        $this->view->typeList    = $typeList;
+        $this->view->type        = $type;
+        $this->view->team        = $team;
+        $this->view->defaultType = $type == '' ? $space->type : $type;
 
         $this->display();
     }
diff --git a/module/kanban/js/editspace.js b/module/kanban/js/editspace.js
new file mode 100644
index 0000000000..f6b1c9bbda
--- /dev/null
+++ b/module/kanban/js/editspace.js
@@ -0,0 +1,11 @@
+/**
+ * When type change.
+ *
+ * @param  string type
+ * @access public
+ * @return void
+ */
+function changeType(spaceID, type)
+{
+    location.href = createLink('kanban', 'editSpace', 'spaceID=' + spaceID + '&type=' + type);
+}
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 3a82c67fe1..3f78e41151 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -271,6 +271,10 @@ $lang->kanbanspace->featureBar['cooperation'] = 'Cooperation Space';
 $lang->kanbanspace->featureBar['public']      = 'Public Space';
 $lang->kanbanspace->featureBar['involved']    = 'Involved';
 
+$lang->kanbanspace->typeList['private']     = 'Private Space';
+$lang->kanbanspace->typeList['cooperation'] = 'Cooperation Space';
+$lang->kanbanspace->typeList['public']      = 'Public Space';
+
 $lang->kanbancolumn = new stdclass();
 $lang->kanbancolumn->name       = $lang->kanban->columnName;
 $lang->kanbancolumn->limit      = $lang->kanban->WIPCount;
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index ca8580188c..7ce89896c9 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -271,6 +271,10 @@ $lang->kanbanspace->featureBar['cooperation'] = '协作空间';
 $lang->kanbanspace->featureBar['public']      = '公共空间';
 $lang->kanbanspace->featureBar['involved']    = '我参与的';
 
+$lang->kanbanspace->typeList['private']     = '私人空间';
+$lang->kanbanspace->typeList['cooperation'] = '协作空间';
+$lang->kanbanspace->typeList['public']      = '公共空间';
+
 $lang->kanbancolumn = new stdclass();
 $lang->kanbancolumn->name       = $lang->kanban->columnName;
 $lang->kanbancolumn->limit      = $lang->kanban->WIPCount;
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 32c0db56eb..6c275a7a15 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1754,7 +1754,7 @@ class kanbanModel extends model
      * @access public
      * @return array
      */
-    public function updateSpace($spaceID)
+    public function updateSpace($spaceID, $type = '')
     {
         $spaceID  = (int)$spaceID;
         $oldSpace = $this->getSpaceById($spaceID);
@@ -1767,6 +1767,8 @@ class kanbanModel extends model
             ->remove('uid,contactListMenu')
             ->get();
 
+        if($type == 'cooperation' or $type == 'public') $space->whitelist = '';
+
         $space = $this->loadModel('file')->processImgURL($space, $this->config->kanban->editor->editspace['id'], $this->post->uid);
 
         $this->dao->update(TABLE_KANBANSPACE)->data($space)
@@ -1775,6 +1777,15 @@ class kanbanModel extends model
             ->where('id')->eq($spaceID)
             ->exec();
 
+        if($oldSpace->type == 'private' and ($type == 'cooperation' or $type == 'public'))
+        {
+            $kanbanList = $this->dao->select('id,team,whitelist')->from(TABLE_KANBAN)->where('space')->eq($spaceID)->andWhere('deleted')->eq('0')->fetchAll('id');
+            foreach($kanbanList as $id => $kanbanData)
+            {
+                $this->dao->update(TABLE_KANBAN)->set('team')->eq($kanbanData->whitelist)->set('whitelist')->eq('')->where('id')->eq($id)->andWhere('deleted')->eq('0')->exec();
+            }
+        }
+
         if(!dao::isError())
         {
             $this->file->saveUpload('kanbanspace', $spaceID);
@@ -1783,6 +1794,12 @@ class kanbanModel extends model
         }
     }
 
+    public function updateKanbanBySpace($spaceID, $type)
+    {
+        $spaceType = $this->dao->select('type')->from(TABLE_KANBANSPACE)->where('id')->eq($spaceID)->fetch();
+
+    }
+
     /**
      * Close a space.
      *
diff --git a/module/kanban/view/editspace.html.php b/module/kanban/view/editspace.html.php
index a354ae3447..59d7f58eec 100644
--- a/module/kanban/view/editspace.html.php
+++ b/module/kanban/view/editspace.html.php
@@ -18,12 +18,17 @@
   </div>
   <form class='form-indicator main-form form-ajax' method='post' enctype='multipart/form-data' id='dataform'>
     <table class='table table-form'>
+      <tr>
+        <th><?php echo $lang->kanbanspace->type;?></th>
+        <td><?php echo html::select('type', $typeList, $defaultType, "onchange='changeType($spaceID, this.value)' class='form-control chosen'");?></td>
+        <td></td>
+      </tr>
       <tr>
         <th><?php echo $lang->kanbanspace->name;?></th>
         <td><?php echo html::input('name', $space->name, "class='form-control'");?></td>
         <td></td>
       </tr>
-      <?php if($space->type != 'private'):?>
+      <?php if($space->type != 'private' or $type == 'cooperation' or $type == 'public'):?>
       <tr>
         <th><?php echo $lang->kanbanspace->owner;?></th>
         <td><?php echo html::select('owner', $users, $space->owner, "class='form-control chosen'");?></td>
@@ -32,7 +37,7 @@
         <th><?php echo $lang->kanbanspace->team;?></th>
         <td colspan='2'>
           <div class="input-group">
-            <?php echo html::select('team[]', $users, $space->team, "class='form-control chosen' multiple data-drop_direction='down'");?>
+            <?php echo html::select('team[]', $users, $team, "class='form-control chosen' multiple data-drop_direction='down'");?>
             <?php echo $this->fetch('my', 'buildContactLists');?>
           </div>
         </td>
@@ -45,7 +50,7 @@
           <?php echo html::textarea('desc', $space->desc, "rows='10' class='form-control'");?>
         </td>
       </tr>
-      <?php if($space->type == 'private'):?>
+      <?php if($space->type == 'private' and $type != 'cooperation' and $type != 'public'):?>
       <tr id="whitelistBox">
         <th><?php echo $lang->whitelist;?></th>
         <td><?php echo html::select('whitelist[]', $users, $space->whitelist, 'class="form-control chosen" multiple');?></td>

From c34a9bbd675e4c5c71866be5ed5c2313f46e2f00 Mon Sep 17 00:00:00 2001
From: Wenrui LI <liwenrui@easycorp.ltd>
Date: Wed, 23 Feb 2022 08:43:36 +0800
Subject: [PATCH 06/12] * remove plan related stuff from action search of lite
 vision, bug #19021.

---
 extension/lite/action/ext/lang/zh-cn/lite.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/extension/lite/action/ext/lang/zh-cn/lite.php b/extension/lite/action/ext/lang/zh-cn/lite.php
index 67162a4212..a2c6480f75 100644
--- a/extension/lite/action/ext/lang/zh-cn/lite.php
+++ b/extension/lite/action/ext/lang/zh-cn/lite.php
@@ -57,8 +57,6 @@ $lang->action->search->label['reviewed']              = $lang->action->label->re
 $lang->action->search->label['moved']                 = $lang->action->label->moved;
 $lang->action->search->label['confirmed']             = $lang->action->label->confirmed;
 $lang->action->search->label['totask']                = $lang->action->label->totask;
-$lang->action->search->label['linked2plan']           = $lang->action->label->linked2plan;
-$lang->action->search->label['unlinkedfromplan']      = $lang->action->label->unlinkedfromplan;
 $lang->action->search->label['changestatus']          = $lang->action->label->changestatus;
 $lang->action->search->label['marked']                = $lang->action->label->marked;
 $lang->action->search->label['linked2project']        = $lang->action->label->linked2project;
@@ -88,4 +86,4 @@ $lang->action->desc->linkchildstory      = '$date, 由 <strong>$actor</strong> 
 $lang->action->desc->unlinkchildrenstory = '$date, 由 <strong>$actor</strong> 移除子目录 <strong>$extra</strong>。' . "\n";
 $lang->action->desc->linkparentstory     = '$date, 由 <strong>$actor</strong> 关联到父目录 <strong>$extra</strong>。' . "\n";
 $lang->action->desc->unlinkparentstory   = '$date, 由 <strong>$actor</strong> 从父目录<strong>$extra</strong>取消关联。' . "\n";
-$lang->action->desc->deletechildrenstory = '$date, 由 <strong>$actor</strong> 删除子目录<strong>$extra</strong>。' . "\n";
\ No newline at end of file
+$lang->action->desc->deletechildrenstory = '$date, 由 <strong>$actor</strong> 删除子目录<strong>$extra</strong>。' . "\n";

From 8d9439d0e671691c21ffaffac8e80c6459a183e4 Mon Sep 17 00:00:00 2001
From: zhangzilong <zhangzilong@easycorp.ltd>
Date: Wed, 23 Feb 2022 08:57:32 +0800
Subject: [PATCH 07/12] * Fix bug #19780.

---
 module/common/view/kanban.html.php | 6 +++++-
 module/story/lang/en.php           | 1 +
 module/story/lang/zh-tw.php        | 1 +
 module/task/lang/zh-cn.php         | 1 -
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php
index e314ecee49..e5e223fd96 100644
--- a/module/common/view/kanban.html.php
+++ b/module/common/view/kanban.html.php
@@ -163,6 +163,9 @@ function renderPlanItem(item, $item)
 function renderProjectItem(item, $item)
 {
     var $title = $item.find('.title');
+
+    console.log($title);
+
     if(!$title.length)
     {
         if(window.userPrivs.project)
@@ -177,7 +180,8 @@ function renderProjectItem(item, $item)
         }
         $title.appendTo($item);
     }
-    $title.text(item.name).attr('title', item.name);
+
+    $title.text(item.name + "<span class='label label-danger label-badge'>{$lang->execution->delayed}</span>").attr('title', item.name);
 
     if(item.status === 'doing')
     {
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 7a65f2ba99..3bc5da90ab 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -126,6 +126,7 @@ $lang->story->rejectedReason = 'Reject Reason';
 $lang->story->reviewedBy     = 'ReviewedBy';
 $lang->story->reviewers      = 'Reviewers';
 $lang->story->reviewedDate   = 'ReviewedDate';
+$lang->story->activatedDate  = 'Activated Date'
 $lang->story->version        = 'Version';
 $lang->story->feedbackBy     = 'From Name';
 $lang->story->notifyEmail    = 'From Email';
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index e64733eaaf..723d3bbf03 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -126,6 +126,7 @@ $lang->story->rejectedReason = '拒絶原因';
 $lang->story->reviewedBy     = '由誰評審';
 $lang->story->reviewers      = '評審人員';
 $lang->story->reviewedDate   = '評審時間';
+$lang->story->activatedDate  = '激活日期';
 $lang->story->version        = '版本號';
 $lang->story->feedbackBy     = '反饋者';
 $lang->story->notifyEmail    = '通知郵箱';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 12aa712844..3b669129b4 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -111,7 +111,6 @@ $lang->task->assignedDate      = '指派日期';
 $lang->task->openedBy          = '由谁创建';
 $lang->task->openedDate        = '创建日期';
 $lang->task->openedDateAB      = '创建';
-$lang->task->activatedDate     = '激活日期';
 $lang->task->finishedBy        = '由谁完成';
 $lang->task->finishedByAB      = '完成者';
 $lang->task->finishedDate      = '实际完成';

From d04ff0a6d9e52662b338ad54bb919748e0c65e10 Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Wed, 23 Feb 2022 09:00:37 +0800
Subject: [PATCH 08/12] * Finish task 49306.

---
 module/execution/js/taskkanban.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js
index d142e39081..7e7b45b102 100644
--- a/module/execution/js/taskkanban.js
+++ b/module/execution/js/taskkanban.js
@@ -271,6 +271,21 @@ function renderColumnCount($count, count, col)
 {
     var text = count + '/' + (col.limit < 0 ? '<i class="icon icon-infinite"></i>' : col.limit);
     $count.html(text + '<i class="icon icon-arrow-up"></i>');
+
+    if(col.limit != -1 && col.limit < count)
+    {
+        $count.parents('.title').parent('.kanban-header-col').css('background-color', '#F6A1A1');
+        $count.parents('.title').find('.text').css('max-width', $count.parents('.title').width() - 200);
+        $count.css('color', '#E33030');
+        if(!$count.parent().find('.error').length) $count.parent().find('.include-last').after("<span class='error text-grey'><icon class='icon icon-help' title='" + kanbanLang.limitExceeded + "'></icon></span>");
+    }
+    else
+    {
+        $count.parents('.title').parent('.kanban-header-col').css('background-color', 'transparent');
+        $count.parents('.title').find('.text').css('max-width', $count.parents('.title').width() - 120);
+        $count.css('color', '#8B91A2');
+        $count.parent().find('.error').remove();
+    }
 }
 
 /**

From 51db3536d74dad3120a81d107ef4b2704b8c0fd8 Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Wed, 23 Feb 2022 09:04:01 +0800
Subject: [PATCH 09/12] *Code bug.

---
 module/execution/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 6318b0ecab..d212039839 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2068,7 +2068,7 @@ class execution extends control
         $this->view->groupBy          = $groupBy;
         $this->view->productID        = $productID;
         $this->view->branchID         = $branchID;
-        $this->view->projectID        = $this->loadModel('task')->getProjectID($execution);
+        $this->view->projectID        = $this->loadModel('task')->getProjectID($execution->id);
         $this->view->allPlans         = $allPlans;
         $this->view->kanbanData       = $kanbanData;
         $this->view->executionActions = $executionActions;

From 516c7b01337155588c1d2b181224a351dd757833 Mon Sep 17 00:00:00 2001
From: zhangzilong <zhangzilong@easycorp.ltd>
Date: Wed, 23 Feb 2022 09:18:47 +0800
Subject: [PATCH 10/12] * Fix bug #19780.

---
 module/common/view/kanban.html.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php
index e5e223fd96..06e4e5e514 100644
--- a/module/common/view/kanban.html.php
+++ b/module/common/view/kanban.html.php
@@ -164,8 +164,6 @@ function renderProjectItem(item, $item)
 {
     var $title = $item.find('.title');
 
-    console.log($title);
-
     if(!$title.length)
     {
         if(window.userPrivs.project)
@@ -180,8 +178,7 @@ function renderProjectItem(item, $item)
         }
         $title.appendTo($item);
     }
-
-    $title.text(item.name + "<span class='label label-danger label-badge'>{$lang->execution->delayed}</span>").attr('title', item.name);
+    $title.text(item.name).attr('title', item.name);
 
     if(item.status === 'doing')
     {

From 0687aaba5719d3c476223accc0259d85ff5f6200 Mon Sep 17 00:00:00 2001
From: zhangzilong <zhangzilong@easycorp.ltd>
Date: Wed, 23 Feb 2022 09:20:18 +0800
Subject: [PATCH 11/12] * Fix bug #19780.

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

diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php
index 06e4e5e514..e314ecee49 100644
--- a/module/common/view/kanban.html.php
+++ b/module/common/view/kanban.html.php
@@ -163,7 +163,6 @@ function renderPlanItem(item, $item)
 function renderProjectItem(item, $item)
 {
     var $title = $item.find('.title');
-
     if(!$title.length)
     {
         if(window.userPrivs.project)

From d8085ec0cdafc6f0cde09a3071ef6433e37a6f9e Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Wed, 23 Feb 2022 01:23:43 +0000
Subject: [PATCH 12/12] Adjust code.

---
 module/kanban/js/editspace.js | 1 +
 module/kanban/model.php       | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/module/kanban/js/editspace.js b/module/kanban/js/editspace.js
index f6b1c9bbda..4ae84ccaf6 100644
--- a/module/kanban/js/editspace.js
+++ b/module/kanban/js/editspace.js
@@ -1,6 +1,7 @@
 /**
  * When type change.
  *
+ * @param  int    spaceID
  * @param  string type
  * @access public
  * @return void
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 6c275a7a15..07e5bbea9d 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1794,12 +1794,6 @@ class kanbanModel extends model
         }
     }
 
-    public function updateKanbanBySpace($spaceID, $type)
-    {
-        $spaceType = $this->dao->select('type')->from(TABLE_KANBANSPACE)->where('id')->eq($spaceID)->fetch();
-
-    }
-
     /**
      * Close a space.
      *