From 815e95eb6cf81d9a72a5565633160c2460bd4ee4 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Wed, 29 Jun 2022 08:30:13 +0000
Subject: [PATCH] fixbug_24544

---
 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      | 3 ++-
 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index a336ab1962..b865791e27 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -2172,6 +2172,7 @@ class testcase extends control
         if(!empty($_POST))
         {
             $this->testcase->importToLib($caseID);
+            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
             if(!empty($caseID)) return $this->send(array('result' => 'success', 'message' => $this->lang->importSuccess, 'closeModal' => true,));
             return $this->send(array('result' => 'success', 'message' => $this->lang->importSuccess, 'locate' => 'reload'));
         }
diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php
index 49cc37dfb2..75a624b4fc 100644
--- a/module/testcase/lang/de.php
+++ b/module/testcase/lang/de.php
@@ -94,6 +94,7 @@ $lang->testcase->mailto           = 'Mailto';
 $lang->testcase->deleted          = 'Deleted';
 $lang->testcase->browseUnits      = 'Unit Test';
 $lang->testcase->suite            = 'Test Suite';
+$lang->testcase->lib              = 'Lib';
 
 $lang->case = $lang->testcase;  // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
 
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index bf6b80c707..9bb76c9391 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -94,6 +94,7 @@ $lang->testcase->mailto           = 'Mailto';
 $lang->testcase->deleted          = 'Deleted';
 $lang->testcase->browseUnits      = 'Unit Test';
 $lang->testcase->suite            = 'Test Suite';
+$lang->testcase->lib              = 'Lib';
 
 $lang->case = $lang->testcase;  // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
 
diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php
index 3a17ba1246..7e57f446e8 100644
--- a/module/testcase/lang/fr.php
+++ b/module/testcase/lang/fr.php
@@ -94,6 +94,7 @@ $lang->testcase->mailto           = 'Mailto';
 $lang->testcase->deleted          = 'Deleted';
 $lang->testcase->browseUnits      = 'Unit Test';
 $lang->testcase->suite            = 'Test Suite';
+$lang->testcase->lib              = 'Lib';
 
 $lang->case = $lang->testcase;  // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
 
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 74b485c9e9..c439aa93be 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -94,6 +94,7 @@ $lang->testcase->mailto           = '抄送给';
 $lang->testcase->deleted          = '是否删除';
 $lang->testcase->browseUnits      = '单元测试';
 $lang->testcase->suite            = '套件';
+$lang->testcase->lib              = '用例库';
 
 $lang->case = $lang->testcase;  // 用于DAO检查时使用。因为case是系统关键字，所以无法定义该模块为case，只能使用testcase，但表还是使用的case。
 
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 9e8e8a45b4..90c8d2e501 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1670,8 +1670,9 @@ class testcaseModel extends model
         $caseIdList = explode(',' , $caseIdList);
         $libID      = $this->post->lib;
 
-        $this->loadModel('action');
+        if(empty($libID)) return dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->testcase->lib);
 
+        $this->loadModel('action');
         $cases          = $this->dao->select('*')->from(TABLE_CASE)->where('deleted')->eq(0)->andWhere('id')->in($caseIdList)->fetchAll('id');
         $caseSteps      = $this->dao->select('*')->from(TABLE_CASESTEP)->where('`case`')->in($caseIdList)->orderBy('id')->fetchGroup('case');
         $caseFiles      = $this->dao->select('*')->from(TABLE_FILE)->where('objectID')->in($caseIdList)->andWhere('objectType')->eq('testcase')->fetchGroup('objectID', 'id');