From 79e71873c52e0cf9a73cf3fff043b10e43d5dac6 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 4 Jul 2022 15:50:03 +0800
Subject: [PATCH 1/9] * Finish task #59477.

---
 module/testcase/control.php |  2 +-
 module/testsuite/model.php  | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index fda3c10423..ec1599aa1b 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1902,7 +1902,7 @@ class testcase extends control
         $this->view->product    = $product;
         $this->view->productID  = $productID;
         $this->view->branch     = $branch;
-        $this->view->cases      = $this->loadModel('testsuite')->getNotImportedCases($productID, $libID, $orderBy, $pager, $browseType, $queryID);
+        $this->view->cases      = $this->loadModel('testsuite')->getLibCases($productID, $libID, $orderBy, $pager, $browseType, $queryID);
         $this->view->modules    = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, $branch === 'all' ? 0 : (int)$branch);
         $this->view->libModules = $this->tree->getOptionMenu($libID, 'caselib');
         $this->view->pager      = $pager;
diff --git a/module/testsuite/model.php b/module/testsuite/model.php
index 9a905698b3..f995a6dc75 100644
--- a/module/testsuite/model.php
+++ b/module/testsuite/model.php
@@ -314,7 +314,7 @@ class testsuiteModel extends model
     }
 
     /**
-     * Get not imported cases.
+     * Get lib cases.
      *
      * @param  int    $productID
      * @param  int    $libID
@@ -323,7 +323,7 @@ class testsuiteModel extends model
      * @access public
      * @return array
      */
-    public function getNotImportedCases($productID, $libID, $orderBy = 'id_desc', $pager = null, $browseType = '', $queryID = 0)
+    public function getLibCases($productID, $libID, $orderBy = 'id_desc', $pager = null, $browseType = '', $queryID = 0, $param = '')
     {
         $importedCases = $this->dao->select('fromCaseID')->from(TABLE_CASE)
             ->where('product')->eq($productID)
@@ -361,18 +361,17 @@ class testsuiteModel extends model
             ->beginIF($browseType != 'bysearch')->andWhere('lib')->eq($libID)->fi()
             ->beginIF($browseType == 'bysearch')->andWhere($query)->fi()
             ->andWhere('product')->eq(0)
-            ->andWhere('id')->notIN($importedCases)
+            ->beginIF(strpos($param, "canimport") !== false)->andWhere('id')->notIN($importedCases)->fi()
             ->orderBy($orderBy)
             ->page($pager)
             ->fetchAll('id');
     }
 
-    
     /**
-     * Build testsuite menu. 
-     * 
-     * @param  object $suite 
-     * @param  string $type 
+     * Build testsuite menu.
+     *
+     * @param  object $suite
+     * @param  string $type
      * @access public
      * @return string
      */

From 8fd283cec3ad5fa4027bc59a5c9ab641b5b68a0c Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 4 Jul 2022 15:56:40 +0800
Subject: [PATCH 2/9]  * Finish task #59477.

---
 module/testsuite/model.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/module/testsuite/model.php b/module/testsuite/model.php
index f995a6dc75..33e83c4421 100644
--- a/module/testsuite/model.php
+++ b/module/testsuite/model.php
@@ -323,15 +323,8 @@ class testsuiteModel extends model
      * @access public
      * @return array
      */
-    public function getLibCases($productID, $libID, $orderBy = 'id_desc', $pager = null, $browseType = '', $queryID = 0, $param = '')
+    public function getLibCases($productID, $libID, $orderBy = 'id_desc', $pager = null, $browseType = '', $queryID = 0)
     {
-        $importedCases = $this->dao->select('fromCaseID')->from(TABLE_CASE)
-            ->where('product')->eq($productID)
-            ->andWhere('lib')->eq($libID)
-            ->andWhere('fromCaseID')->ne('')
-            ->andWhere('deleted')->eq(0)
-            ->fetchPairs('fromCaseID', 'fromCaseID');
-
         $query = '';
         if($browseType == 'bysearch')
         {
@@ -361,7 +354,6 @@ class testsuiteModel extends model
             ->beginIF($browseType != 'bysearch')->andWhere('lib')->eq($libID)->fi()
             ->beginIF($browseType == 'bysearch')->andWhere($query)->fi()
             ->andWhere('product')->eq(0)
-            ->beginIF(strpos($param, "canimport") !== false)->andWhere('id')->notIN($importedCases)->fi()
             ->orderBy($orderBy)
             ->page($pager)
             ->fetchAll('id');

From d1f25755f1abefbf5cd6fed5a9c8df06203095c3 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 5 Jul 2022 09:39:55 +0800
Subject: [PATCH 3/9] * Finish task #59477.

---
 module/testcase/control.php                 | 43 +++++++++++----------
 module/testcase/model.php                   |  9 +++--
 module/testcase/view/importfromlib.html.php |  3 +-
 module/testsuite/model.php                  | 23 +++++++++++
 4 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index ec1599aa1b..8ccdf7d6ee 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1860,14 +1860,6 @@ class testcase extends control
         $this->loadModel('branch');
         if($product->type != 'normal') $branches = array(BRANCH_MAIN => $this->lang->branch->main) + $this->branch->getPairs($productID, 'active', $projectID);
 
-        if($_POST)
-        {
-            $this->testcase->importFromLib($productID);
-            return print(js::reload('parent'));
-        }
-
-        $this->app->tab == 'project' ? $this->loadModel('project')->setMenu($this->session->project) : $this->testcase->setMenu($this->products, $productID, $branch);
-
         $libraries = $this->loadModel('caselib')->getLibraries();
         if(empty($libraries))
         {
@@ -1876,6 +1868,14 @@ class testcase extends control
         }
         if(empty($libID) or !isset($libraries[$libID])) $libID = key($libraries);
 
+        if($_POST)
+        {
+            $this->testcase->importFromLib($productID, $libID);
+            return print(js::reload('parent'));
+        }
+
+        $this->app->tab == 'project' ? $this->loadModel('project')->setMenu($this->session->project) : $this->testcase->setMenu($this->products, $productID, $branch);
+
         /* Build the search form. */
         $actionURL = $this->createLink('testcase', 'importFromLib', "productID=$productID&branch=$branch&libID=$libID&orderBy=$orderBy&browseType=bySearch&queryID=myQueryID");
         $this->config->testcase->search['module']    = 'testsuite';
@@ -1897,19 +1897,20 @@ class testcase extends control
         $this->view->title      = $this->lang->testcase->common . $this->lang->colon . $this->lang->testcase->importFromLib;
         $this->view->position[] = $this->lang->testcase->importFromLib;
 
-        $this->view->libraries  = $libraries;
-        $this->view->libID      = $libID;
-        $this->view->product    = $product;
-        $this->view->productID  = $productID;
-        $this->view->branch     = $branch;
-        $this->view->cases      = $this->loadModel('testsuite')->getLibCases($productID, $libID, $orderBy, $pager, $browseType, $queryID);
-        $this->view->modules    = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, $branch === 'all' ? 0 : (int)$branch);
-        $this->view->libModules = $this->tree->getOptionMenu($libID, 'caselib');
-        $this->view->pager      = $pager;
-        $this->view->orderBy    = $orderBy;
-        $this->view->branches   = $branches;
-        $this->view->browseType = $browseType;
-        $this->view->queryID    = $queryID;
+        $this->view->libraries       = $libraries;
+        $this->view->libID           = $libID;
+        $this->view->product         = $product;
+        $this->view->productID       = $productID;
+        $this->view->branch          = $branch;
+        $this->view->cases           = $this->loadModel('testsuite')->getLibCases($productID, $libID, $orderBy, $pager, $browseType, $queryID);
+        $this->view->modules         = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, $branch === 'all' ? 0 : (int)$branch);
+        $this->view->libModules      = $this->tree->getOptionMenu($libID, 'caselib');
+        $this->view->pager           = $pager;
+        $this->view->orderBy         = $orderBy;
+        $this->view->branches        = $branches;
+        $this->view->browseType      = $browseType;
+        $this->view->queryID         = $queryID;
+        $this->view->importedModules = $this->testsuite->getImportedModules($productID, $libID);
 
         $this->display();
     }
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 169ab985b3..714f46cfa4 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1576,19 +1576,22 @@ class testcaseModel extends model
      * Import case from Lib.
      *
      * @param  int    $productID
+     * @param  int    $libID
      * @access public
      * @return void
      */
-    public function importFromLib($productID)
+    public function importFromLib($productID, $libID = 0)
     {
         $data = fixer::input('post')->get();
 
-        $prevModule = 0;
-        $prevBranch = 0;
+        $prevModule      = 0;
+        $prevBranch      = 0;
+        $importedModules = $this->loadModel('testsuite')->getImportedModules($productID, $libID);
         foreach($data->module as $i => $module)
         {
             if($module != 'ditto') $prevModule = $module;
             if($module == 'ditto') $data->module[$i] = $prevModule;
+            if(isset($importedModules[$i][$data->module[$i]])) unset($data->caseIdList[$i]);
         }
 
         if(isset($data->branch))
diff --git a/module/testcase/view/importfromlib.html.php b/module/testcase/view/importfromlib.html.php
index f25864f2ab..8ee1c69919 100644
--- a/module/testcase/view/importfromlib.html.php
+++ b/module/testcase/view/importfromlib.html.php
@@ -65,7 +65,8 @@
           <td class='text-left' title='<?php echo $libModule?>'><?php echo $libModule;?></td>
           <td class='text-left' data-module='<?php echo $case->module?>' style='overflow:visible'>
             <?php if($i > 0) $modules['ditto'] = $lang->testcase->ditto;?>
-            <?php echo html::select("module[{$case->id}]", $modules, $i == 0 ? 0 : 'ditto', "class='form-control chosen'");?>
+            <?php $importedCaseModules = isset($importedModules[$case->id]) ? $importedModules[$case->id] : array();?>
+            <?php echo html::select("module[{$case->id}]", array_diff_key($modules, $importedCaseModules), $i == 0 ? 0 : 'ditto', "class='form-control chosen'");?>
           </td>
           <td><?php echo zget($lang->testcase->typeList, $case->type);?></td>
         </tr>
diff --git a/module/testsuite/model.php b/module/testsuite/model.php
index 33e83c4421..e6f71df1bb 100644
--- a/module/testsuite/model.php
+++ b/module/testsuite/model.php
@@ -359,6 +359,29 @@ class testsuiteModel extends model
             ->fetchAll('id');
     }
 
+    /**
+     * Get imported case modules.
+     *
+     * @param  int    $productID
+     * @param  int    $libID
+     * @param  string $orderBy
+     * @param  object $pager
+     * @access public
+     * @return array
+     */
+    public function getImportedModules($productID, $libID)
+    {
+        $importedModules = $this->dao->select('fromCaseID,module')->from(TABLE_CASE)
+            ->where('product')->eq($productID)
+            ->andWhere('lib')->eq($libID)
+            ->andWhere('fromCaseID')->ne('')
+            ->andWhere('deleted')->eq(0)
+            ->fetchGroup('fromCaseID', 'module');
+        foreach($importedModules as $fromCaseID => $modules) $importedModules[$fromCaseID] = array_combine(array_keys($modules), array_keys($modules));
+
+        return $importedModules;
+    }
+
     /**
      * Build testsuite menu.
      *

From 57c87e59124b283771058a07ffb5c1b274c787b6 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 5 Jul 2022 13:52:57 +0800
Subject: [PATCH 4/9] * Finish task #59477.

---
 module/testcase/control.php                 | 33 +++++++++++----------
 module/testcase/js/importfromlib.js         | 24 +++++++++++----
 module/testcase/model.php                   | 23 +++++++++-----
 module/testcase/view/importfromlib.html.php |  6 ++--
 module/testsuite/model.php                  | 27 +++++++++++++----
 5 files changed, 76 insertions(+), 37 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index 8ccdf7d6ee..b4fe25fa16 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1870,7 +1870,7 @@ class testcase extends control
 
         if($_POST)
         {
-            $this->testcase->importFromLib($productID, $libID);
+            $this->testcase->importFromLib($productID, $libID, $branch);
             return print(js::reload('parent'));
         }
 
@@ -1890,6 +1890,9 @@ class testcase extends control
         unset($this->config->testcase->search['fields']['branch']);
         $this->loadModel('search')->setSearchParams($this->config->testcase->search);
 
+        $this->loadModel('testsuite');
+        foreach($branches as $branchID => $branchName) $canImportModules[$branchID] = $this->testsuite->getCanImportModules($productID, $libID, $branchID);
+
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
         $pager = pager::init(0, $recPerPage, $pageID);
@@ -1897,20 +1900,20 @@ class testcase extends control
         $this->view->title      = $this->lang->testcase->common . $this->lang->colon . $this->lang->testcase->importFromLib;
         $this->view->position[] = $this->lang->testcase->importFromLib;
 
-        $this->view->libraries       = $libraries;
-        $this->view->libID           = $libID;
-        $this->view->product         = $product;
-        $this->view->productID       = $productID;
-        $this->view->branch          = $branch;
-        $this->view->cases           = $this->loadModel('testsuite')->getLibCases($productID, $libID, $orderBy, $pager, $browseType, $queryID);
-        $this->view->modules         = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, $branch === 'all' ? 0 : (int)$branch);
-        $this->view->libModules      = $this->tree->getOptionMenu($libID, 'caselib');
-        $this->view->pager           = $pager;
-        $this->view->orderBy         = $orderBy;
-        $this->view->branches        = $branches;
-        $this->view->browseType      = $browseType;
-        $this->view->queryID         = $queryID;
-        $this->view->importedModules = $this->testsuite->getImportedModules($productID, $libID);
+        $this->view->libraries        = $libraries;
+        $this->view->libID            = $libID;
+        $this->view->product          = $product;
+        $this->view->productID        = $productID;
+        $this->view->branch           = $branch;
+        $this->view->cases            = $this->testsuite->getCanImportCases($productID, $libID, $branch, $orderBy, $pager, $browseType, $queryID);
+        $this->view->modules          = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, $branch === 'all' ? 0 : (int)$branch);
+        $this->view->libModules       = $this->tree->getOptionMenu($libID, 'caselib');
+        $this->view->pager            = $pager;
+        $this->view->orderBy          = $orderBy;
+        $this->view->branches         = $branches;
+        $this->view->browseType       = $browseType;
+        $this->view->queryID          = $queryID;
+        $this->view->canImportModules = $canImportModules;
 
         $this->display();
     }
diff --git a/module/testcase/js/importfromlib.js b/module/testcase/js/importfromlib.js
index c0e851db04..5a121f4703 100644
--- a/module/testcase/js/importfromlib.js
+++ b/module/testcase/js/importfromlib.js
@@ -52,14 +52,14 @@ function updateModules(productID, branch, caseID)
     var tr = $('#module' + caseID).closest('tr');
     if(branch !== 'ditto')
     {
-        loadModules(tr, caseID, moduleLink);
+        loadModules(tr, caseID, moduleLink, undefined, branch);
         tr.nextAll().each(function()
         {
             var nextCaseID = $(this).attr('id');
             var nextBranch = $('#branch' + nextCaseID + ' option:selected').val();
             if(nextBranch !== 'ditto') return false;
             var nextTr = $('#module' + nextCaseID).closest('tr');
-            loadModules(nextTr, nextCaseID, moduleLink, true);
+            loadModules(nextTr, nextCaseID, moduleLink, true, branch);
         });
     }
     else
@@ -76,14 +76,14 @@ function updateModules(productID, branch, caseID)
             }
         });
         link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=case&branch=' + branchID + '&rootModuleID=0&returnType=html&fieldID=&needManage=true');
-        loadModules(tr, caseID, link, true);
+        loadModules(tr, caseID, link, true, branchID);
         tr.nextAll().each(function()
         {
             var nextCaseID = $(this).attr('id');
             var nextBranch = $('#branch' + nextCaseID + ' option:selected').val();
             if(nextBranch !== 'ditto') return false;
             var nextTr = $('#module' + nextCaseID).closest('tr');
-            loadModules(nextTr, nextCaseID, link, true);
+            loadModules(nextTr, nextCaseID, link, true, branchID);
         });
     }
 }
@@ -95,17 +95,31 @@ function updateModules(productID, branch, caseID)
  * @param  int     $caseID
  * @param  string  $link
  * @param  boolean $isAddDitto
+ * @param  int     $branch
  * @access public
  * @return void
  */
-function loadModules(tr, caseID, link, isAddDitto)
+function loadModules(tr, caseID, link, isAddDitto, branch)
 {
     var isAddDitto = (typeof(isAddDitto) === 'undefined') ? false : true;
 
     $('#module' + caseID).parent('td').load(link, function(data)
     {
+        if(canImportModules[branch][caseID] != undefined && Object.keys(canImportModules[branch][caseID]).length > 0)
+        {
+            $('tr select#module').children().each(function()
+            {
+                moduleID = $(this).val();
+                if(canImportModules[branch][caseID][moduleID] == undefined)
+                {
+                    $(this).remove();
+                }
+            })
+        }
+
         tr.find('#module').chosen();
         tr.find('#module').attr({"id": 'module' + caseID, "name": 'module[' + caseID + ']'});
+        tr.find('#module' + caseID).removeAttr('onchange');
         if(isAddDitto == true) addDittoOption(caseID);
     });
 }
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 714f46cfa4..be90a1dd5e 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1580,32 +1580,37 @@ class testcaseModel extends model
      * @access public
      * @return void
      */
-    public function importFromLib($productID, $libID = 0)
+    public function importFromLib($productID, $libID, $branch)
     {
         $data = fixer::input('post')->get();
 
-        $prevModule      = 0;
-        $prevBranch      = 0;
-        $importedModules = $this->loadModel('testsuite')->getImportedModules($productID, $libID);
+        $prevModule = 0;
+        $prevBranch = 0;
         foreach($data->module as $i => $module)
         {
             if($module != 'ditto') $prevModule = $module;
             if($module == 'ditto') $data->module[$i] = $prevModule;
-            if(isset($importedModules[$i][$data->module[$i]])) unset($data->caseIdList[$i]);
         }
 
+        $caseModules = array();
+        $this->loadModel('testsuite');
         if(isset($data->branch))
         {
             foreach($data->branch as $i => $branch)
             {
                 if($branch != 'ditto') $prevBranch = $branch;
                 if($branch == 'ditto') $data->branch[$i] = $prevBranch;
+                if(!isset($caseModules[$data->branch[$i]])) $caseModules[$data->branch[$i]] = $this->testsuite->getCanImportModules($productID, $libID,  $data->branch[$i]);
             }
         }
+        else
+        {
+            $caseModules[$branch] = $this->loadModel('testsuite')->getCanImportModules($productID, $libID,  $branch);
+        }
 
-        $libCases = $this->dao->select('*')->from(TABLE_CASE)->where('deleted')->eq(0)->andWhere('id')->in($data->caseIdList)->fetchAll('id');
-        $libSteps = $this->dao->select('*')->from(TABLE_CASESTEP)->where('`case`')->in($data->caseIdList)->orderBy('id')->fetchGroup('case');
-        $libFiles = $this->dao->select('*')->from(TABLE_FILE)->where('objectID')->in($data->caseIdList)->andWhere('objectType')->eq('testcase')->fetchGroup('objectID', 'id');
+        $libCases    = $this->dao->select('*')->from(TABLE_CASE)->where('deleted')->eq(0)->andWhere('id')->in($data->caseIdList)->fetchAll('id');
+        $libSteps    = $this->dao->select('*')->from(TABLE_CASESTEP)->where('`case`')->in($data->caseIdList)->orderBy('id')->fetchGroup('case');
+        $libFiles    = $this->dao->select('*')->from(TABLE_FILE)->where('objectID')->in($data->caseIdList)->andWhere('objectType')->eq('testcase')->fetchGroup('objectID', 'id');
         foreach($libCases as $libCaseID => $case)
         {
             $case->fromCaseID      = $case->id;
@@ -1615,6 +1620,8 @@ class testcaseModel extends model
             if(isset($data->branch[$case->id])) $case->branch = $data->branch[$case->id];
             unset($case->id);
 
+            if(isset($caseModules[$data->branch[$i]][$case->fromCaseID]) and !isset($caseModules[$data->branch[$i]][$case->fromCaseID][$case->module])) continue;
+
             $this->dao->insert(TABLE_CASE)->data($case)->autoCheck()->exec();
 
             if(!dao::isError())
diff --git a/module/testcase/view/importfromlib.html.php b/module/testcase/view/importfromlib.html.php
index 8ee1c69919..679f925f78 100644
--- a/module/testcase/view/importfromlib.html.php
+++ b/module/testcase/view/importfromlib.html.php
@@ -13,6 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('flow', $config->global->flow);?>
 <?php js::set('ditto', $lang->testcase->ditto);?>
+<?php js::set('canImportModules', $canImportModules);?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <div class='input-group w-300px'>
@@ -46,7 +47,7 @@
       </thead>
       <tbody>
         <?php $i = 0;?>
-        <?php foreach($cases as $case):?>
+        <?php foreach($cases as $id => $case):?>
         <tr id='<?php echo $case->id;?>'>
           <td class='c-id'>
             <div class="checkbox-primary">
@@ -65,8 +66,7 @@
           <td class='text-left' title='<?php echo $libModule?>'><?php echo $libModule;?></td>
           <td class='text-left' data-module='<?php echo $case->module?>' style='overflow:visible'>
             <?php if($i > 0) $modules['ditto'] = $lang->testcase->ditto;?>
-            <?php $importedCaseModules = isset($importedModules[$case->id]) ? $importedModules[$case->id] : array();?>
-            <?php echo html::select("module[{$case->id}]", array_diff_key($modules, $importedCaseModules), $i == 0 ? 0 : 'ditto', "class='form-control chosen'");?>
+            <?php echo html::select("module[{$case->id}]", isset($canImportModules[$branch][$case->id]) ? $canImportModules[$branch][$case->id] : $modules, $i == 0 ? 0 : 'ditto', "class='form-control chosen'");?>
           </td>
           <td><?php echo zget($lang->testcase->typeList, $case->type);?></td>
         </tr>
diff --git a/module/testsuite/model.php b/module/testsuite/model.php
index e6f71df1bb..a9e6bc3fbc 100644
--- a/module/testsuite/model.php
+++ b/module/testsuite/model.php
@@ -314,16 +314,17 @@ class testsuiteModel extends model
     }
 
     /**
-     * Get lib cases.
+     * Get can import cases.
      *
      * @param  int    $productID
      * @param  int    $libID
+     * @param  int    $branch
      * @param  string $orderBy
      * @param  object $pager
      * @access public
      * @return array
      */
-    public function getLibCases($productID, $libID, $orderBy = 'id_desc', $pager = null, $browseType = '', $queryID = 0)
+    public function getCanImportCases($productID, $libID, $branch, $orderBy = 'id_desc', $pager = null, $browseType = '', $queryID = 0)
     {
         $query = '';
         if($browseType == 'bysearch')
@@ -350,9 +351,18 @@ class testsuiteModel extends model
             if(!$withAllLib) $query .= " AND `lib` = '$libID'";
         }
 
+        $caseModules = $this->getCanImportModules($productID, $libID,  $branch === 'all' ? 0 : (int)$branch);
+
+        $importedCaseIdList = array();
+        foreach($caseModules as $caseID => $modules)
+        {
+            if(empty($modules)) $importedCaseIdList[$caseID] = $caseID;
+        }
+
         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()
+            ->andWhere('id')->notIn($importedCaseIdList)
             ->andWhere('product')->eq(0)
             ->orderBy($orderBy)
             ->page($pager)
@@ -364,22 +374,27 @@ class testsuiteModel extends model
      *
      * @param  int    $productID
      * @param  int    $libID
-     * @param  string $orderBy
-     * @param  object $pager
+     * @param  int    $branch
      * @access public
      * @return array
      */
-    public function getImportedModules($productID, $libID)
+    public function getCanImportModules($productID, $libID, $branch)
     {
         $importedModules = $this->dao->select('fromCaseID,module')->from(TABLE_CASE)
             ->where('product')->eq($productID)
             ->andWhere('lib')->eq($libID)
+            ->andWhere('branch')->eq($branch)
             ->andWhere('fromCaseID')->ne('')
             ->andWhere('deleted')->eq(0)
             ->fetchGroup('fromCaseID', 'module');
         foreach($importedModules as $fromCaseID => $modules) $importedModules[$fromCaseID] = array_combine(array_keys($modules), array_keys($modules));
 
-        return $importedModules;
+        $modules = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, $branch);
+
+        $canImportModules = array();
+        foreach($importedModules as $caseID => $caseModules) $canImportModules[$caseID] = array_diff_key($modules, $importedModules[$caseID]);
+
+        return $canImportModules;
     }
 
     /**

From c82f3f188629111687b0a161881f1701410a08cf Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 5 Jul 2022 14:36:16 +0800
Subject: [PATCH 5/9] * Finish task #59477.

---
 module/testcase/control.php    |  1 +
 module/testcase/lang/de.php    |  1 +
 module/testcase/lang/en.php    |  1 +
 module/testcase/lang/fr.php    |  1 +
 module/testcase/lang/zh-cn.php |  1 +
 module/testcase/model.php      | 19 +++++++++++++++----
 module/testsuite/model.php     |  3 ++-
 7 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index b4fe25fa16..1f7dbf694c 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1892,6 +1892,7 @@ class testcase extends control
 
         $this->loadModel('testsuite');
         foreach($branches as $branchID => $branchName) $canImportModules[$branchID] = $this->testsuite->getCanImportModules($productID, $libID, $branchID);
+        if(empty($branches)) $canImportModules[0] = $this->testsuite->getCanImportModules($productID, $libID, 0);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php
index a9091726da..20888cd3c8 100644
--- a/module/testcase/lang/de.php
+++ b/module/testcase/lang/de.php
@@ -235,6 +235,7 @@ $lang->testcase->noLibrary        = "Es existiert keine Bibliothek. Bitte erstel
 $lang->testcase->mustChooseResult = 'Prüfungsergebnis wird benötigt.';
 $lang->testcase->noModule         = '<div>Es existieren keine Module</div><div>Jetzt verwalten</div>';
 $lang->testcase->noCase           = 'Keine Fälle. ';
+$lang->testcase->importedCases    = 'The case with ID%s has been imported in the same module and has been ignored.';
 
 $lang->testcase->searchStories = 'Story suchen';
 $lang->testcase->selectLib     = 'Bibliothek wählen';
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 33fa088e2a..98f7e19313 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -235,6 +235,7 @@ $lang->testcase->noLibrary        = "No library exists. Please create one first.
 $lang->testcase->mustChooseResult = 'Review result is required.';
 $lang->testcase->noModule         = '<div>You have no modules.</div><div>Manage it now.</div>';
 $lang->testcase->noCase           = 'No cases yet. ';
+$lang->testcase->importedCases    = 'The case with ID%s has been imported in the same module and has been ignored.';
 
 $lang->testcase->searchStories = 'Enter to search for stories';
 $lang->testcase->selectLib     = 'Select Library';
diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php
index 1e36412913..52d72910af 100644
--- a/module/testcase/lang/fr.php
+++ b/module/testcase/lang/fr.php
@@ -235,6 +235,7 @@ $lang->testcase->noLibrary        = "Aucune library n'existe. Créez-en une pour
 $lang->testcase->mustChooseResult = 'La Validation du résultat est nécessaire.';
 $lang->testcase->noModule         = "<div>Vous n'avez aucun modules.</div><div>Gérer les modules maintenant.</div>";
 $lang->testcase->noCase           = "Aucun CasTest pour l'instant. ";
+$lang->testcase->importedCases    = 'Le cas d\'utilisation avec l\'ID %s est déjà importé dans le même module, il est donc ignoré.';
 
 $lang->testcase->searchStories = 'Rechercher des stories';
 $lang->testcase->selectLib     = 'Sélectionner Library';
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 779e22aab7..5496e40098 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -235,6 +235,7 @@ $lang->testcase->noLibrary        = "现在还没有用例库，请先创建！"
 $lang->testcase->mustChooseResult = '必须选择评审结果';
 $lang->testcase->noModule         = '<div>您现在还没有模块信息</div><div>请维护测试模块</div>';
 $lang->testcase->noCase           = '暂时没有用例。';
+$lang->testcase->importedCases    = 'ID为 %s 的用例在相同模块已经导入，已忽略。';
 
 $lang->testcase->searchStories = "键入来搜索{$lang->SRCommon}";
 $lang->testcase->selectLib     = '请选择库';
diff --git a/module/testcase/model.php b/module/testcase/model.php
index be90a1dd5e..9830a835f6 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1608,9 +1608,10 @@ class testcaseModel extends model
             $caseModules[$branch] = $this->loadModel('testsuite')->getCanImportModules($productID, $libID,  $branch);
         }
 
-        $libCases    = $this->dao->select('*')->from(TABLE_CASE)->where('deleted')->eq(0)->andWhere('id')->in($data->caseIdList)->fetchAll('id');
-        $libSteps    = $this->dao->select('*')->from(TABLE_CASESTEP)->where('`case`')->in($data->caseIdList)->orderBy('id')->fetchGroup('case');
-        $libFiles    = $this->dao->select('*')->from(TABLE_FILE)->where('objectID')->in($data->caseIdList)->andWhere('objectType')->eq('testcase')->fetchGroup('objectID', 'id');
+        $libCases = $this->dao->select('*')->from(TABLE_CASE)->where('deleted')->eq(0)->andWhere('id')->in($data->caseIdList)->fetchAll('id');
+        $libSteps = $this->dao->select('*')->from(TABLE_CASESTEP)->where('`case`')->in($data->caseIdList)->orderBy('id')->fetchGroup('case');
+        $libFiles = $this->dao->select('*')->from(TABLE_FILE)->where('objectID')->in($data->caseIdList)->andWhere('objectType')->eq('testcase')->fetchGroup('objectID', 'id');
+        $imported = '';
         foreach($libCases as $libCaseID => $case)
         {
             $case->fromCaseID      = $case->id;
@@ -1620,7 +1621,12 @@ class testcaseModel extends model
             if(isset($data->branch[$case->id])) $case->branch = $data->branch[$case->id];
             unset($case->id);
 
-            if(isset($caseModules[$data->branch[$i]][$case->fromCaseID]) and !isset($caseModules[$data->branch[$i]][$case->fromCaseID][$case->module])) continue;
+            $branch = isset($case->branch) ? $case->branch : 0;
+            if(isset($caseModules[$branch][$case->fromCaseID]) and !isset($caseModules[$branch][$case->fromCaseID][$case->module]))
+            {
+                $imported .= "$case->fromCaseID,";
+                continue;
+            }
 
             $this->dao->insert(TABLE_CASE)->data($case)->autoCheck()->exec();
 
@@ -1665,6 +1671,11 @@ class testcaseModel extends model
                 $this->loadModel('action')->create('case', $caseID, 'fromlib', '', $case->lib);
             }
         }
+        if(!empty($imported))
+        {
+            $imported = trim($imported, ',');
+            return print(js::error(sprintf($this->lang->testcase->importedCases, $imported)));
+        }
     }
 
     /**
diff --git a/module/testsuite/model.php b/module/testsuite/model.php
index a9e6bc3fbc..801ed76ce6 100644
--- a/module/testsuite/model.php
+++ b/module/testsuite/model.php
@@ -389,7 +389,8 @@ class testsuiteModel extends model
             ->fetchGroup('fromCaseID', 'module');
         foreach($importedModules as $fromCaseID => $modules) $importedModules[$fromCaseID] = array_combine(array_keys($modules), array_keys($modules));
 
-        $modules = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, $branch);
+        $modules          = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, $branch);
+        $modules['ditto'] = $this->lang->testcase->ditto;
 
         $canImportModules = array();
         foreach($importedModules as $caseID => $caseModules) $canImportModules[$caseID] = array_diff_key($modules, $importedModules[$caseID]);

From 7bb148a48b6f414464398cb06bdb5ea768e1e388 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 5 Jul 2022 22:17:19 +0800
Subject: [PATCH 6/9] * Fix bug of task #59477.

---
 module/testcase/control.php                 |  1 -
 module/testcase/model.php                   |  2 +-
 module/testcase/view/importfromlib.html.php | 20 ++++++++++++----
 module/testsuite/model.php                  | 26 +++++++++++++--------
 4 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index 1f7dbf694c..a62582efda 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1907,7 +1907,6 @@ class testcase extends control
         $this->view->productID        = $productID;
         $this->view->branch           = $branch;
         $this->view->cases            = $this->testsuite->getCanImportCases($productID, $libID, $branch, $orderBy, $pager, $browseType, $queryID);
-        $this->view->modules          = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, $branch === 'all' ? 0 : (int)$branch);
         $this->view->libModules       = $this->tree->getOptionMenu($libID, 'caselib');
         $this->view->pager            = $pager;
         $this->view->orderBy          = $orderBy;
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 9830a835f6..c97ab5aa2b 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1622,7 +1622,7 @@ class testcaseModel extends model
             unset($case->id);
 
             $branch = isset($case->branch) ? $case->branch : 0;
-            if(isset($caseModules[$branch][$case->fromCaseID]) and !isset($caseModules[$branch][$case->fromCaseID][$case->module]))
+            if(empty($caseModules[$branch][$case->fromCaseID][$case->module]))
             {
                 $imported .= "$case->fromCaseID,";
                 continue;
diff --git a/module/testcase/view/importfromlib.html.php b/module/testcase/view/importfromlib.html.php
index 679f925f78..b75bf9c432 100644
--- a/module/testcase/view/importfromlib.html.php
+++ b/module/testcase/view/importfromlib.html.php
@@ -48,6 +48,18 @@
       <tbody>
         <?php $i = 0;?>
         <?php foreach($cases as $id => $case):?>
+        <?php
+        $caseBranches = $branches;
+        $caseBranch   = $branch;
+        foreach($caseBranches as $branchID => $branchName)
+        {
+            if(empty($canImportModules[$branchID][$case->id]))
+            {
+                unset($caseBranches[$branchID]);
+                if($caseBranch == $branchID) $caseBranch = key($caseBranches);
+            }
+        }
+        ?>
         <tr id='<?php echo $case->id;?>'>
           <td class='c-id'>
             <div class="checkbox-primary">
@@ -57,16 +69,16 @@
             <?php printf('%03d', $case->id);?>
           </td>
           <?php if($product->type != 'normal'):?>
-          <?php if($i > 0) $branches['ditto'] = $lang->testcase->ditto;?>
-          <td><?php echo html::select("branch[{$case->id}]", $branches, $i == 0 ? $branch : 'ditto', "class='form-control' onchange='updateModules($productID, this.value, $case->id)'")?></td>
+          <?php if($i > 0) $caseBranches['ditto'] = $lang->testcase->ditto;?>
+          <td><?php echo html::select("branch[{$case->id}]", $caseBranches, $i == 0 ? $caseBranch : 'ditto', "class='form-control' onchange='updateModules($productID, this.value, $case->id)'")?></td>
           <?php endif;?>
           <td><span class='label-pri <?php echo 'label-pri-' . $case->pri;?>' title='<?php echo zget($lang->testcase->priList, $case->pri, $case->pri);?>'><?php echo $case->pri == '0' ? '' : zget($lang->testcase->priList, $case->pri, $case->pri);?></span></td>
           <td class='text-left nobr'><?php if(!common::printLink('testcase', 'view', "caseID=$case->id", $case->title)) echo $case->title;?></td>
           <?php $libModule = zget($libModules, $case->module, '');?>
           <td class='text-left' title='<?php echo $libModule?>'><?php echo $libModule;?></td>
           <td class='text-left' data-module='<?php echo $case->module?>' style='overflow:visible'>
-            <?php if($i > 0) $modules['ditto'] = $lang->testcase->ditto;?>
-            <?php echo html::select("module[{$case->id}]", isset($canImportModules[$branch][$case->id]) ? $canImportModules[$branch][$case->id] : $modules, $i == 0 ? 0 : 'ditto', "class='form-control chosen'");?>
+            <?php if($i == 0) unset($canImportModules[$caseBranch][$case->id]['ditto']);?>
+            <?php echo html::select("module[{$case->id}]", $canImportModules[$caseBranch][$case->id], $i == 0 ? 0 : 'ditto', "class='form-control chosen'");?>
           </td>
           <td><?php echo zget($lang->testcase->typeList, $case->type);?></td>
         </tr>
diff --git a/module/testsuite/model.php b/module/testsuite/model.php
index 801ed76ce6..cdce1bb6b3 100644
--- a/module/testsuite/model.php
+++ b/module/testsuite/model.php
@@ -351,18 +351,17 @@ class testsuiteModel extends model
             if(!$withAllLib) $query .= " AND `lib` = '$libID'";
         }
 
-        $caseModules = $this->getCanImportModules($productID, $libID,  $branch === 'all' ? 0 : (int)$branch);
 
-        $importedCaseIdList = array();
-        foreach($caseModules as $caseID => $modules)
-        {
-            if(empty($modules)) $importedCaseIdList[$caseID] = $caseID;
-        }
+        $this->loadModel('branch');
+        $product  = $this->loadModel('product')->getById($productID);
+        $branches = $product->type != 'normal' ? array(BRANCH_MAIN => $this->lang->branch->main) + $this->branch->getPairs($productID, 'active') : array(0);
+        $canImport = array();
+        foreach($branches as $branchID => $branchName) $canImport += $this->getCanImportModules($productID, $libID, $branchID);
 
         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()
-            ->andWhere('id')->notIn($importedCaseIdList)
+            ->andWhere('id')->in(array_keys($canImport))
             ->andWhere('product')->eq(0)
             ->orderBy($orderBy)
             ->page($pager)
@@ -389,11 +388,18 @@ class testsuiteModel extends model
             ->fetchGroup('fromCaseID', 'module');
         foreach($importedModules as $fromCaseID => $modules) $importedModules[$fromCaseID] = array_combine(array_keys($modules), array_keys($modules));
 
-        $modules          = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, $branch);
-        $modules['ditto'] = $this->lang->testcase->ditto;
+        $libCases = $this->loadModel('caselib')->getLibCases($libID, 'all');
+
+        $modules = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, $branch);
 
         $canImportModules = array();
-        foreach($importedModules as $caseID => $caseModules) $canImportModules[$caseID] = array_diff_key($modules, $importedModules[$caseID]);
+        foreach($libCases as $caseID => $case)
+        {
+            $caseModules = !empty($importedModules[$caseID]) ? $importedModules[$caseID] : array();
+            $canImportModules[$caseID] = array_diff_key($modules, $caseModules);
+            if(!empty($canImportModules[$caseID])) $canImportModules[$caseID]['ditto'] = $this->lang->testcase->ditto;
+            if(empty($canImportModules[$caseID])) unset($canImportModules[$caseID]);
+        }
 
         return $canImportModules;
     }

From 432445463620f476a4beb0e394f782f7b9af1515 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 6 Jul 2022 08:52:27 +0800
Subject: [PATCH 7/9] * Fix bug of task #59477.

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

diff --git a/module/testcase/view/importfromlib.html.php b/module/testcase/view/importfromlib.html.php
index b75bf9c432..82c5ddfb10 100644
--- a/module/testcase/view/importfromlib.html.php
+++ b/module/testcase/view/importfromlib.html.php
@@ -50,7 +50,7 @@
         <?php foreach($cases as $id => $case):?>
         <?php
         $caseBranches = $branches;
-        $caseBranch   = $branch;
+        $caseBranch   = $branch == 'all' ? 0 : $branch;
         foreach($caseBranches as $branchID => $branchName)
         {
             if(empty($canImportModules[$branchID][$case->id]))

From 500302a5906a22a5f181df3fe58baa0bf81e109a Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 6 Jul 2022 09:28:10 +0800
Subject: [PATCH 8/9] * Fix bug of task #59477.

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

diff --git a/module/testcase/view/importfromlib.html.php b/module/testcase/view/importfromlib.html.php
index 82c5ddfb10..f170c00a50 100644
--- a/module/testcase/view/importfromlib.html.php
+++ b/module/testcase/view/importfromlib.html.php
@@ -50,7 +50,7 @@
         <?php foreach($cases as $id => $case):?>
         <?php
         $caseBranches = $branches;
-        $caseBranch   = $branch == 'all' ? 0 : $branch;
+        $caseBranch   = ($branch == 'all' or empty($branch)) ? 0 : $branch;
         foreach($caseBranches as $branchID => $branchName)
         {
             if(empty($canImportModules[$branchID][$case->id]))

From 45183de128524d3e68be37100f7e010a5d9bd5e2 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 6 Jul 2022 09:49:20 +0800
Subject: [PATCH 9/9] * Add annotation.

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

diff --git a/module/testcase/model.php b/module/testcase/model.php
index c97ab5aa2b..78e9ba8d13 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1577,6 +1577,7 @@ class testcaseModel extends model
      *
      * @param  int    $productID
      * @param  int    $libID
+     * @param  int    $branch
      * @access public
      * @return void
      */