From c4409fce08e5a11335f935597f41f2d9b1b4661b Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Wed, 28 Apr 2021 17:22:23 +0800
Subject: [PATCH 01/10] * Fix upgrade logic.

---
 module/upgrade/view/to15guide.html.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/module/upgrade/view/to15guide.html.php b/module/upgrade/view/to15guide.html.php
index e6dd742c3c..39c5e9b440 100644
--- a/module/upgrade/view/to15guide.html.php
+++ b/module/upgrade/view/to15guide.html.php
@@ -10,14 +10,6 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php 
-$mode = 'classic';
-if(isset($config->maxVersion))
-{
-    unset($lang->upgrade->to15Mode['classic']);
-    $mode = 'new';
-}
-?>
 <?php include '../../common/view/header.lite.html.php';?>
 <div class='container'>
   <div class='panel' style='padding:50px; margin:50px 300px;'>
@@ -26,7 +18,7 @@ if(isset($config->maxVersion))
       <div class='panel-body'>
         <div style='width:600px; margin: auto;'>
           <?php echo $lang->upgrade->to15Desc;?>
-          <?php echo html::radio('mode', $lang->upgrade->to15Mode, $mode);?>
+          <?php echo html::radio('mode', $lang->upgrade->to15Mode, 'classic');?>
           <p> </p>
           <div id='selectedModeTips' class='text-info'><?php echo $lang->upgrade->selectedModeTips['classic'];?></div>
         </div>

From 6530f01c2ffa632445d77ab1fef8f77164baf137 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Wed, 28 Apr 2021 17:26:40 +0800
Subject: [PATCH 02/10] * Fix bug #12415.

---
 module/testcase/model.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/module/testcase/model.php b/module/testcase/model.php
index e73a87ea52..4d8bc59ec6 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -501,12 +501,14 @@ class testcaseModel extends model
         if($branch and strpos($caseQuery, '`branch` =') === false) $caseQuery .= " AND `branch` in('0','$branch')";
         if(strpos($caseQuery, $allBranch) !== false) $caseQuery = str_replace($allBranch, '1', $caseQuery);
         $caseQuery .= ')';
-        $caseQuery  = str_replace(array('`product`', '`version`'), array('t1.`product`', 't1.`version`'), $caseQuery);
+        $caseQuery  = str_replace('`version`', 't1.`version`', $caseQuery);
 
         if($this->app->openApp == 'project') $caseQuery = str_replace('`product`', 't2.`product`', $caseQuery);
-        $cases = $this->dao->select('*')->from(TABLE_CASE)
-            ->beginIF($this->app->openApp == 'project')->alias('t1')->fi()
-            ->beginIF($this->app->openApp == 'project')->leftJoin(TABLE_PROJECTCASE)->alias('t2')->on('t1.id=t2.case')->fi()
+
+        /* Search criteria under compatible project. */
+        $sql = $this->dao->select('*')->from(TABLE_CASE)->alias('t1');
+        if($this->app->openApp == 'project') $sql->leftJoin(TABLE_PROJECTCASE)->alias('t2')->on('t1.id=t2.case');
+        $cases = $sql
             ->where($caseQuery)
             ->beginIF($this->app->openApp == 'project')->andWhere('t2.project')->eq($this->session->project)->fi()
             ->beginIF(!empty($productID) and $queryProductID != 'all')

From b0ee3e7adab2864f2e1361afdd8dc29e161e8d78 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Thu, 29 Apr 2021 08:26:38 +0800
Subject: [PATCH 03/10] * Adjust code.

---
 module/group/control.php                | 8 ++++++--
 module/group/view/managemember.html.php | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/module/group/control.php b/module/group/control.php
index 588e4ea9b2..1705d62172 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -256,7 +256,12 @@ class group extends control
         $groupUsers   = $this->group->getUserPairs($groupID);
         $allUsers     = $this->loadModel('dept')->getDeptUserPairs($deptID);
         $otherUsers   = array_diff_assoc($allUsers, $groupUsers);
-        $outsideUsers = $this->user->getPairs('outside|noclosed|noletter|noempty');
+
+        if($this->config->systemMode == 'new')
+        {
+            $outsideUsers = $this->user->getPairs('outside|noclosed|noletter|noempty');
+            $this->view->outsideUsers = array_diff_assoc($outsideUsers, $groupUsers);
+        }
 
         $title      = $this->lang->company->common . $this->lang->colon . $group->name . $this->lang->colon . $this->lang->group->manageMember;
         $position[] = $group->name;
@@ -268,7 +273,6 @@ class group extends control
         $this->view->deptTree     = $this->loadModel('dept')->getTreeMenu($rooteDeptID = 0, array('deptModel', 'createGroupManageMemberLink'), $groupID);
         $this->view->groupUsers   = $groupUsers;
         $this->view->otherUsers   = $otherUsers;
-        $this->view->outsideUsers = array_diff_assoc($outsideUsers, $groupUsers);
         $this->display();
     }
 
diff --git a/module/group/view/managemember.html.php b/module/group/view/managemember.html.php
index 5a1cc302e0..723cf84131 100644
--- a/module/group/view/managemember.html.php
+++ b/module/group/view/managemember.html.php
@@ -58,6 +58,7 @@
               <?php endforeach;?>
             </td>
           </tr>
+          <?php if($config->systemMode == 'new'):?>
           <tr>
             <th class='w-140px'>
               <div class="checkbox-primary checkbox-inline checkbox-right check-all">
@@ -71,6 +72,7 @@
               <?php endforeach;?>
             </td>
           </tr>
+          <?php endif;?>
           <tr>
             <td class='text-center form-actions' colspan='2'>
               <?php

From d285dd2aea09b4508adbd396702772d21b8020ca Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Thu, 29 Apr 2021 09:00:40 +0800
Subject: [PATCH 04/10] * Fix bug #12444.

---
 module/product/control.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index 345eb79397..5996b5b15f 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -474,13 +474,13 @@ class product extends control
 
         /* Get the relevant person in charge. */
         $this->loadModel('user');
-        $poUsers = $this->user->getPairs('nodeleted|pofirst',  $product->PO, $this->config->maxCount);
+        $poUsers = $this->user->getPairs('nodeleted|pofirst|noclosed',  $product->PO, $this->config->maxCount);
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PO"] = $this->config->user->moreLink;
 
-        $qdUsers = $this->user->getPairs('nodeleted|qdfirst',  $product->QD, $this->config->maxCount);
+        $qdUsers = $this->user->getPairs('nodeleted|qdfirst|noclosed',  $product->QD, $this->config->maxCount);
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["QD"] = $this->config->user->moreLink;
 
-        $rdUsers = $this->user->getPairs('nodeleted|devfirst', $product->RD, $this->config->maxCount);
+        $rdUsers = $this->user->getPairs('nodeleted|devfirst|noclosed', $product->RD, $this->config->maxCount);
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink;
 
         $lines = array();

From aacdace38379a05bcb0723ba2318819c4ecffc52 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Thu, 29 Apr 2021 09:02:26 +0800
Subject: [PATCH 05/10] * Fix bug #12446.

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

diff --git a/module/doc/control.php b/module/doc/control.php
index 79f82565e6..52c1d53317 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -199,7 +199,7 @@ class doc extends control
         if(!empty($lib->execution)) $this->view->execution = $this->dao->select('id,name')->from(TABLE_EXECUTION)->where('id')->eq($lib->execution)->fetch();
         $this->view->lib     = $lib;
         $this->view->groups  = $this->loadModel('group')->getPairs();
-        $this->view->users   = $this->user->getPairs('noletter', $lib->users);
+        $this->view->users   = $this->user->getPairs('noletter|noclosed', $lib->users);
         $this->view->libID   = $libID;
 
         die($this->display());

From bfc78b6f437f3c2a1daa4ff8f4a02eb505d915b2 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Thu, 29 Apr 2021 09:39:40 +0800
Subject: [PATCH 06/10] * Fix bug #12445.

---
 module/doc/css/editlib.css       | 2 --
 module/doc/view/editlib.html.php | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/module/doc/css/editlib.css b/module/doc/css/editlib.css
index 31bffbcc89..da498e6a63 100644
--- a/module/doc/css/editlib.css
+++ b/module/doc/css/editlib.css
@@ -1,6 +1,4 @@
 form {margin-right: 30px;}
 
-.chosen-container .chosen-results {max-height: 180px;}
-
 #whiteListBox div.input-group {margin-bottom: 2px;}
 #whiteListBox .input-group:last-child {margin-top: 10px;}
diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php
index c72d7835b5..74cac9150b 100644
--- a/module/doc/view/editlib.html.php
+++ b/module/doc/view/editlib.html.php
@@ -12,6 +12,11 @@
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
 <?php include '../../common/view/chosen.html.php';?>
+<?php if($lib->type == 'product'):?>
+<style> .chosen-container .chosen-results {max-height: 180px;}</style>
+<?php else:?>
+<style> .chosen-container .chosen-results {max-height: 145px;}</style>
+<?php endif;?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>

From 95ff14e30f98c3ea0e5c4afe4ad7de1ed25dd1a1 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Thu, 29 Apr 2021 09:55:03 +0800
Subject: [PATCH 07/10] * Fix bug #12450.

---
 module/execution/model.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/module/execution/model.php b/module/execution/model.php
index 6f2eab0f95..5e4ebdae82 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1182,6 +1182,10 @@ class executionModel extends model
         {
             $link = helper::createLink('execution', $module, "executionID=%s");
         }
+        elseif($module == 'repo')
+        {
+            $link = helper::createLink('repo', 'browse', "repoID=0&branchID=&executionID=%s");
+        }
         else
         {
             $link = helper::createLink($module, $method, "executionID=%s");

From cf1ca1ad6d4b3b5b0f9f126c14923c1de11dd10c Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Thu, 29 Apr 2021 10:23:39 +0800
Subject: [PATCH 08/10] * Fix bug #12246.

---
 module/project/control.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/module/project/control.php b/module/project/control.php
index c008174851..817cad57bc 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -173,6 +173,9 @@ class project extends control
     {
         $projectID = $this->project->saveState($projectID, $this->project->getPairsByProgram());
 
+        if($projectID == 0 and common::hasPriv('project', 'create')) $this->locate($this->createLink('project', 'create'));
+        if($projectID == 0 and !common::hasPriv('project', 'create')) $this->locate($this->createLink('project', 'browse'));
+
         $this->project->setMenu($projectID);
 
         $project = $this->project->getByID($projectID);

From 19395757fee9316f4b59b53a6b6bbd5a3f7b5229 Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Thu, 29 Apr 2021 10:27:47 +0800
Subject: [PATCH 09/10] * Fix bug #12451.

---
 module/testtask/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/testtask/model.php b/module/testtask/model.php
index 93acd2e789..6d95b453e0 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -1130,7 +1130,7 @@ class testtaskModel extends model
             /* Update testRun's status. */
             if(!dao::isError())
             {
-                $runStatus = $caseResult == 'blocked' ? 'blocked' : 'done';
+                $runStatus = $caseResult == 'blocked' ? 'blocked' : 'normal';
                 $this->dao->update(TABLE_TESTRUN)
                     ->set('lastRunResult')->eq($caseResult)
                     ->set('status')->eq($runStatus)
@@ -1429,7 +1429,7 @@ class testtaskModel extends model
                 foreach(explode(',', trim($run->stage, ',')) as $stage) echo $this->lang->testcase->stageList[$stage] . '<br />';
                 break;
             case 'status':
-                echo $caseChanged ? "<span class='warning'>{$this->lang->testcase->changed}</span>" : $this->processStatus('testtask', $run);
+                echo $caseChanged ? "<span class='warning'>{$this->lang->testcase->changed}</span>" : $this->processStatus('testcase', $run);
                 break;
             case 'precondition':
                 echo $run->precondition;

From 44385524fa470bd8d9d0e7920cace6023baa4743 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Thu, 29 Apr 2021 10:50:26 +0800
Subject: [PATCH 10/10] * Fix bug #12452.

---
 module/caselib/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/caselib/model.php b/module/caselib/model.php
index 55b27f7336..af1cc74af9 100644
--- a/module/caselib/model.php
+++ b/module/caselib/model.php
@@ -26,6 +26,7 @@ class caselibModel extends model
         /* Set case lib menu. */
         $products =$this->loadModel('product')->getPairs();
         if(!empty($products) and $this->session->product) $this->loadModel('qa')->setMenu($products, $this->session->product);
+        if(empty($products)) $this->loadModel('qa')->setMenu($products, 0);
 
         if($libraries)
         {