From 827d6f50820d3e8c8b309e34e792de8d6b47a41f Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Fri, 26 Aug 2022 09:09:45 +0800
Subject: [PATCH] * Fix bug #26903 and Fix todo unit test.

---
 module/story/lang/zh-cn.php     |  4 ++--
 module/user/model.php           |  2 +-
 test/class/todo.class.php       |  7 ++++---
 test/model/todo/batchcreate.php | 10 +++++-----
 test/model/todo/batchupdate.php |  2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 9b854de29b..c91748a806 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -154,8 +154,8 @@ $lang->story->children         = "子需求";
 $lang->story->childrenAB       = "子";
 $lang->story->linkStories      = "相关{$lang->SRCommon}";
 $lang->story->linkRequirements = "相关{$lang->URCommon}";
-$lang->story->childStories     = "细分需求";
-$lang->story->duplicateStory   = "重复需求ID";
+$lang->story->childStories     = "细分{$lang->SRCommon}";
+$lang->story->duplicateStory   = "重复{$lang->SRCommon}ID";
 $lang->story->reviewResult     = '评审意见';
 $lang->story->reviewResultAB   = '评审结果';
 $lang->story->preVersion       = '之前版本';
diff --git a/module/user/model.php b/module/user/model.php
index f0d90532c9..a2c0442d3f 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -1087,7 +1087,7 @@ class userModel extends model
         if(!$stmt) return array('rights' => $rights, 'acls' => $acls);
         while($row = $stmt->fetch(PDO::FETCH_ASSOC))
         {
-            $rights[strtolower($row['module'])][strtolower($row['method'])] = true;
+            if($row['module'] and $row['method']) $rights[strtolower($row['module'])][strtolower($row['method'])] = true;
         }
 
         /* Get can manage projects by user. */
diff --git a/test/class/todo.class.php b/test/class/todo.class.php
index 0f5696d4ed..9ba0799c57 100755
--- a/test/class/todo.class.php
+++ b/test/class/todo.class.php
@@ -3,9 +3,10 @@ class todoTest
 {
     public function __construct()
     {
-         global $tester;
-         $this->objectModel = $tester->loadModel('todo');
-         $tester->app->loadClass('dao');
+        global $tester;
+        $this->objectModel = $tester->loadModel('todo');
+        $tester->app->loadClass('dao');
+        $_SERVER['HTTP_HOST'] = 'test.zentao.net';
     }
 
     /**
diff --git a/test/model/todo/batchcreate.php b/test/model/todo/batchcreate.php
index 06ffc578f9..f412b75a6a 100755
--- a/test/model/todo/batchcreate.php
+++ b/test/model/todo/batchcreate.php
@@ -23,8 +23,8 @@ $descs  = array('desc1', 'desc2', 'desc3', 'desc4', '' , '', '', '');
 $begins = array('0830', '0900', '0930', '1000', '1030', '1100', '1130', '1200');
 $ends   = array('0900', '0930', '1000','1030', '1100', '1130', '1200', '1230');
 $bugs   = array('2' => '313');
-
-$noname_create = array('types' => $types, 'pris' => $pris, 'names' => $names, 'descs' => $descs, 'begins' => $begins, 'ends' => $ends);
+$assignedTos = array('user1', 'ditto', 'ditto', 'ditto', 'ditto', 'ditto', 'ditto', 'ditto',);
+$noname_create = array('types' => $types, 'pris' => $pris, 'names' => $names, 'descs' => $descs, 'begins' => $begins, 'ends' => $ends, 'assignedTos' => $assignedTos);
 
 $names     = array('批量创建待办4','批量创建待办5','批量创建待办6', '批量创建待办7', '', '', '', '');
 $types     = array('bug', 'story', 'task', 'testtask', 'custom', 'custom', 'custom', 'custom');
@@ -33,10 +33,10 @@ $stories   = array('2' => '1');
 $tasks     = array('3' => '1');
 $testtasks = array('4' => '1');
 
-$except_create = array('types' => $types, 'pris' => $pris, 'names' => $names, 'descs' => $descs, 'begins' => $begins, 'ends' => $ends, 'bugs' => $bugs, 'stories' => $stories, 'tasks' => $tasks, 'testtasks' => $testtasks);
+$except_create = array('types' => $types, 'pris' => $pris, 'names' => $names, 'descs' => $descs, 'begins' => $begins, 'ends' => $ends, 'bugs' => $bugs, 'stories' => $stories, 'tasks' => $tasks, 'testtasks' => $testtasks, 'assignedTos' => $assignedTos);
 
 $todo = new todoTest();
 
 r($todo->batchCreateTest($noname_create)) && p('2006:name,desc,pri,type,idvalue;2007:name,desc,pri,type,idvalue;2008:name,desc,pri,type,idvalue')                                 && e('批量创建待办1,desc1,1,custom,0;批量创建待办2,desc2,2,custom,0;批量创建待办3,desc4,4,custom,0'); // 批量创建有个没有名字的待办
-r($todo->batchCreateTest($except_create)) && p('2009:name,desc,pri,type,idvalue;2010:name,desc,pri,type,idvalue;2011:name,desc,pri,type,idvalue;2012:name,desc,pri,type,idvalue') && e('测试单转Bug13,desc1,1,bug,313;用户需求版本一61,desc2,2,story,1;开发任务11,desc3,3,task,1;测试单1,desc4,4,testtask,1'); // 批量创建的待办
-$db->restoreDB();
\ No newline at end of file
+r($todo->batchCreateTest($except_create)) && p('2009:name,desc,pri,type,idvalue;2010:name,desc,pri,type,idvalue;2011:name,desc,pri,type,idvalue;2012:name,desc,pri,type,idvalue') && e('测试单转Bug13,desc1,1,bug,313;软件需求版本一551,desc2,2,story,1;开发任务11,desc3,3,task,1;测试单1,desc4,4,testtask,1'); // 批量创建的待办
+$db->restoreDB();
diff --git a/test/model/todo/batchupdate.php b/test/model/todo/batchupdate.php
index 3c8c5434e4..791074b8e4 100755
--- a/test/model/todo/batchupdate.php
+++ b/test/model/todo/batchupdate.php
@@ -32,4 +32,4 @@ $todo = new todoTest();
 r($todo->batchUpdateTest($changeType, '3'))   && p('0:field,old,new') && e('type,task,custom');   // 批量修改todo类型
 r($todo->batchUpdateTest($changePri, '2'))    && p('0:field,old,new') && e('pri,2,1');            // 批量修改todo优先级
 r($todo->batchUpdateTest($changeStatus, '1')) && p('0:field,old,new') && e('status,wait,doing');  // 批量修改todo状态
-$db->restoreDB();
\ No newline at end of file
+$db->restoreDB();