From ce9688022357682dc69a2be2a03a0b3bf6aa84cd Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Thu, 11 Mar 2021 14:17:06 +0800
Subject: [PATCH 1/2]  * Fix bug #11264.

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

diff --git a/module/testsuite/model.php b/module/testsuite/model.php
index 1784547e8b..0862c0b3ad 100644
--- a/module/testsuite/model.php
+++ b/module/testsuite/model.php
@@ -357,7 +357,7 @@ class testsuiteModel extends model
         return $this->dao->select('*')->from(TABLE_CASE)->where('deleted')->eq(0)
             ->beginIF($browseType != 'bysearch')->andWhere('lib')->eq($libID)->fi()
             ->beginIF($browseType == 'bysearch')->andWhere($query)->fi()
-            ->begin($this->config->systemMode == 'new' and $this->lang->navGroup->testsuite != 'qa')->andWhere('project')->eq($this->session->PRJ)->fi()
+            ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testsuite != 'qa')->andWhere('project')->eq($this->session->PRJ)->fi()
             ->andWhere('product')->eq(0)
             ->andWhere('id')->notIN($importedCases)
             ->orderBy($orderBy)

From ae00791f4e896f4eb0b166cf11e77d5b063ebc12 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Thu, 11 Mar 2021 14:22:04 +0800
Subject: [PATCH 2/2]  * Finish task #11267.

---
 module/execution/model.php                 | 6 +++---
 module/project/control.php                 | 2 +-
 module/project/view/managemembers.html.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 6a2783adb0..afe46ce8d1 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -2276,9 +2276,9 @@ class executionModel extends model
 
         extract($data);
         $executionType = $execution->type;
-        $accounts    = array_unique($accounts);
-        $limited     = array_values($limited);
-        $oldJoin     = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq((int)$executionID)->andWhere('type')->eq($executionType)->fetchPairs();
+        $accounts      = array_unique($accounts);
+        $limited       = array_values($limited);
+        $oldJoin       = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq((int)$executionID)->andWhere('type')->eq($executionType)->fetchPairs();
         $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq((int)$executionID)->andWhere('type')->eq($executionType)->exec();
 
         $executionMember = array();
diff --git a/module/project/control.php b/module/project/control.php
index f4be96a87e..d78af391d4 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -795,7 +795,7 @@ class project extends control
 
         if(!empty($_POST))
         {
-            $this->project->manageMembers($projectID);
+            $this->execution->manageMembers($projectID);
             $link = $this->createLink('project', 'manageMembers', "projectID=$projectID");
             $this->send(array('message' => $this->lang->saveSuccess, 'result' => 'success', 'locate' => $link));
         }
diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php
index 8fd1a51807..968b5caa5b 100644
--- a/module/project/view/managemembers.html.php
+++ b/module/project/view/managemembers.html.php
@@ -72,7 +72,7 @@
           <td><input type='text' name='roles[]' id='role<?php  echo ($i);?>' class='form-control' /></td>
           <td><input type='text' name='days[]'  id='days<?php  echo ($i);?>' class='form-control' value='<?php echo $project->days?>'/></td>
           <td>
-            <input type='text'   name='hours[]' id='hours<?php echo ($i);?>' class='form-control' value='<?php echo $config->project->defaultWorkhours?>' />
+            <input type='text'   name='hours[]' id='hours<?php echo ($i);?>' class='form-control' value='<?php echo $config->execution->defaultWorkhours?>' />
           </td>
           <td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td>
           <td class='c-actions text-center'>