From 9cdcd2a428686c50d501fba5fce935107111bbbd Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 7 Dec 2020 13:10:59 +0800
Subject: [PATCH 1/4] * Fix bug #3636.

---
 module/task/view/batchedit.html.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index 9bc469e2ad..0925f4f923 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -101,6 +101,11 @@
             }
             else
             {
+                if(!isset($taskMembers[$tasks[$taskID]->assignedTo]))
+                {
+                    $members = $this->project->getTeamMemberPairs($tasks[$taskID]->project, 'nodeleted');
+                    $members = array('' => '', 'ditto' => $this->lang->task->ditto) + $members;
+                }
                 $taskMembers = $members;
             }
             ?>

From f5f3dcfc99ade15642ea77aa83200a17ce756a2c Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Mon, 7 Dec 2020 14:37:24 +0800
Subject: [PATCH 2/4] * Fix bug #3707.

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

diff --git a/module/todo/model.php b/module/todo/model.php
index 4af2b7da86..7fa113bd2a 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -33,7 +33,7 @@ class todoModel extends model
             ->setIF($this->post->type == 'feedback' and $this->post->feedback, 'idvalue', $this->post->feedback)
             ->setIF($this->post->date == false,  'date', '2030-01-01')
             ->setIF($this->post->begin == false, 'begin', '2400')
-            ->setIF($this->post->end   == false, 'end',   '2400')
+            ->setIF($this->post->begin == false or $this->post->end   == false, 'end',   '2400')
             ->stripTags($this->config->todo->editor->create['id'], $this->config->allowedTags)
             ->remove('bug, task, story, uid, feedback')
             ->get();

From 2b26da8044460dcc04635b5f01e34ace13fa2b17 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Mon, 7 Dec 2020 15:20:24 +0800
Subject: [PATCH 3/4] * Fix bug #3730.

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

diff --git a/module/user/view/story.html.php b/module/user/view/story.html.php
index 213a0f2737..fef1977900 100644
--- a/module/user/view/story.html.php
+++ b/module/user/view/story.html.php
@@ -51,7 +51,7 @@
       <tbody>
         <?php foreach($stories as $key => $story):?>
           <?php $storyLink = $this->createLink('story', 'view', "id=$story->id");?>
-          <tr class='text-center'>
+          <tr class='text-left'>
           <td><?php echo html::a($storyLink, sprintf('%03d', $story->id));?></td>
           <td><span class='<?php echo 'pri' . zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
           <td><?php echo $story->productTitle;?></td>

From 99359da6fd2e6f43b648d3566fcd7d30363b30ee Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Tue, 8 Dec 2020 08:29:08 +0800
Subject: [PATCH 4/4] * Fix bug.

---
 module/user/view/task.html.php     | 2 +-
 module/user/view/testcase.html.php | 2 +-
 module/user/view/todo.html.php     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php
index b4fa0b3e95..58e4b5ccb0 100644
--- a/module/user/view/task.html.php
+++ b/module/user/view/task.html.php
@@ -53,7 +53,7 @@
       </thead>   
       <tbody>
         <?php foreach($tasks as $task):?>
-        <tr class='text-center'>
+        <tr class='text-left'>
           <td><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
           <td><span class='<?php echo 'pri' . zget($lang->task->priList, $task->pri, $task->pri);?>'><?php echo $task->pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
           <td class='text-left nobr'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></td>
diff --git a/module/user/view/testcase.html.php b/module/user/view/testcase.html.php
index 7648ef036b..ec0b77f711 100755
--- a/module/user/view/testcase.html.php
+++ b/module/user/view/testcase.html.php
@@ -49,7 +49,7 @@
       <tbody>
         <?php foreach($cases as $case):?>
         <?php $caseID = $type == 'case2Him' ? $case->case : $case->id?>
-        <tr class='text-center'>
+        <tr class='text-left'>
           <td><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), sprintf('%03d', $caseID));?></td>
           <td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
           <td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), $case->title);?></td>
diff --git a/module/user/view/todo.html.php b/module/user/view/todo.html.php
index 6cdb23fc57..bd08be7eb2 100644
--- a/module/user/view/todo.html.php
+++ b/module/user/view/todo.html.php
@@ -47,7 +47,7 @@
       </thead>
       <tbody>
       <?php foreach($todos as $todo):?>
-      <tr class='text-center'>
+      <tr class='text-left'>
         <td><?php echo $todo->id;?></td>
         <td><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
         <td><?php echo $lang->todo->typeList[$todo->type];?></td>