From 5b752451915c4b38b2a7b2d2b801d21a48a5795d Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Mon, 10 Aug 2020 16:13:52 +0800
Subject: [PATCH 1/6]  * Fix bug custom required testtask.

---
 module/testtask/lang/de.php    | 1 +
 module/testtask/lang/en.php    | 1 +
 module/testtask/lang/fr.php    | 1 +
 module/testtask/lang/vi.php    | 1 +
 module/testtask/lang/zh-cn.php | 1 +
 5 files changed, 5 insertions(+)

diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index 6c0581064c..c80f4d76b8 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -15,6 +15,7 @@ $lang->testtask->reportChart      = 'Bericht';
 $lang->testtask->reportAction     = 'Case Report';
 $lang->testtask->delete           = "Löschen";
 $lang->testtask->importUnitResult = "Import Unit Result";
+$lang->testtask->importunitresult = "Import Unit Result"; //Fix bug custom required testtask.
 $lang->testtask->browseUnits      = "Unit Test List";
 $lang->testtask->unitCases        = "Unit Test Cases";
 $lang->testtask->view             = "Übersicht";
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 24fe6cde41..65277edc5f 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -15,6 +15,7 @@ $lang->testtask->reportChart      = 'Report';
 $lang->testtask->reportAction     = 'Case Report';
 $lang->testtask->delete           = "Delete Request";
 $lang->testtask->importUnitResult = "Import Unit Result";
+$lang->testtask->importunitresult = "Import Unit Result"; //Fix bug custom required testtask.
 $lang->testtask->browseUnits      = "Unit Test List";
 $lang->testtask->unitCases        = "Unit Test Cases";
 $lang->testtask->view             = "Request Detail";
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index eba1dd12b7..d915a71cbb 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -15,6 +15,7 @@ $lang->testtask->reportChart      = 'Rapport';
 $lang->testtask->reportAction     = 'Rapport CasTests';
 $lang->testtask->delete           = "Supprimer Campagne";
 $lang->testtask->importUnitResult = "Import T.U. Résult";
+$lang->testtask->importunitresult = "Import T.U. Résult"; //Fix bug custom required testtask.
 $lang->testtask->browseUnits      = "Liste des tests unitaires";
 $lang->testtask->unitCases        = "Cas de test unitaires";
 $lang->testtask->view             = "Détail Campagne";
diff --git a/module/testtask/lang/vi.php b/module/testtask/lang/vi.php
index eb0155f6eb..4bb1666c1a 100644
--- a/module/testtask/lang/vi.php
+++ b/module/testtask/lang/vi.php
@@ -15,6 +15,7 @@ $lang->testtask->reportChart      = 'Báo cáo';
 $lang->testtask->reportAction     = 'Báo cáo tình huống';
 $lang->testtask->delete           = "Xóa yêu cầu";
 $lang->testtask->importUnitResult = "Import Unit Result";
+$lang->testtask->importunitresult = "Import Unit Result"; //Fix bug custom required testtask.
 $lang->testtask->browseUnits      = "Unit Test List";
 $lang->testtask->unitCases        = "Unit Test Cases";
 $lang->testtask->view             = "Chi tiết yêu cầu";
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 1d5c5d7a40..3aa542985c 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -15,6 +15,7 @@ $lang->testtask->reportChart      = '报表统计';
 $lang->testtask->reportAction     = '用例报表统计';
 $lang->testtask->delete           = "删除测试单";
 $lang->testtask->importUnitResult = "导入单元测试结果";
+$lang->testtask->importunitresult = "导入单元测试"; //Fix bug custom required testtask.
 $lang->testtask->browseUnits      = "单元测试列表";
 $lang->testtask->unitCases        = "单元测试用例";
 $lang->testtask->view             = "概况";

From 21fe8daa0da7b7d31a169ec9aa7408ce3830b672 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Mon, 10 Aug 2020 16:22:10 +0800
Subject: [PATCH 2/6] Fix bug #3338 #3342

---
 module/doc/model.php       | 8 ++++----
 module/project/control.php | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/module/doc/model.php b/module/doc/model.php
index 4e93fc45d4..5c0201d6a1 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -338,7 +338,7 @@ class docModel extends model
                 ->andWhere('addedBy')->eq($this->app->user->account)
                 ->orderBy($sort)
                 ->page($pager)
-                ->fetchAll();
+                ->fetchAll('id');
         }
         elseif($browseType == 'byediteddate')
         {
@@ -365,7 +365,7 @@ class docModel extends model
                 ->andWhere('collector')->like("%,{$this->app->user->account},%")
                 ->orderBy($sort)
                 ->page($pager)
-                ->fetchAll();
+                ->fetchAll('id');
         }
         elseif($browseType == "bymodule")
         {
@@ -422,7 +422,7 @@ class docModel extends model
                 ->andWhere('lib')->in($allLibs)
                 ->orderBy($sort)
                 ->page($pager)
-                ->fetchAll();
+                ->fetchAll('id');
         }
         elseif($browseType == 'fastsearch')
         {
@@ -440,7 +440,7 @@ class docModel extends model
                 ->andWhere('t1.lib')->in($allLibs)
                 ->orderBy($sort)
                 ->page($pager)
-                ->fetchAll();
+                ->fetchAll('id');
             foreach($docs as $doc) $doc->title = str_replace($this->session->searchDoc, "<span style='color:red'>{$this->session->searchDoc}</span>", $doc->title);
         }
 
diff --git a/module/project/control.php b/module/project/control.php
index 7ac0974948..ee09997c0b 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1649,6 +1649,8 @@ class project extends control
         $this->app->session->set('taskList',    $uri);
         $this->app->session->set('storyList',   $uri);
         $this->app->session->set('projectList', $uri);
+        $this->app->session->set('caseList', $uri);
+        $this->app->session->set('bugList', $uri);
 
         if($type === 'json') die(helper::jsonEncode4Parse($tree, JSON_HEX_QUOT | JSON_HEX_APOS));
 

From 507ea33b82713b8ac85e1eb5c41c2c063f2327f8 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 10 Aug 2020 17:31:56 +0800
Subject: [PATCH 3/6]  * Fix bug #2483.

---
 module/doc/view/showfiles.html.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php
index ce5ff2fb1c..479aff0ee0 100644
--- a/module/doc/view/showfiles.html.php
+++ b/module/doc/view/showfiles.html.php
@@ -36,6 +36,7 @@
                   echo html::hidden('pageID',     isset($this->get->pageID) ? $this->get->pageID : 0);
               }
               ?>
+              <?php echo html::hidden('onlybody', isonlybody() ? 'yes' : 'no');?>
               <?php echo html::input('title', $this->get->title, "class='form-control' placeholder='{$lang->doc->fileTitle}'");?>
               <?php echo html::submitButton("<i class='icon icon-search'></i>", '', "btn  btn-icon btn-link input-control-icon-right");?>
             </form>

From bb8d5e954cc76d3fc344a90559ca05b9a9be8637 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 10 Aug 2020 17:32:49 +0800
Subject: [PATCH 4/6]  * Fix bug #3176.

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

diff --git a/module/story/model.php b/module/story/model.php
index e5b2176f0f..72dc3c455d 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2917,7 +2917,7 @@ class storyModel extends model
                 echo $story->estimate;
                 break;
             case 'stage':
-                if(isset($storyStages[$story->id]))
+                if(isset($storyStages[$story->id]) and !empty($branches))
                 {
                     echo "<div class='dropdown dropdown-hover'>";
                     echo $this->lang->story->stageList[$story->stage];

From 61d11bcc947250d676f01a6c32a37d7ad5e3ee6d Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 10 Aug 2020 17:33:14 +0800
Subject: [PATCH 5/6]  * Fix bug #3340.

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

diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index 8d16660518..afd3af2f0f 100644
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -15,7 +15,7 @@
   <div class="main-header">
     <h2><?php echo $storyID ? $this->lang->story->subdivide : $this->lang->story->batchCreate;?></h2>
     <div class="pull-right btn-toolbar">
-      <?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=story&params=' . helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn btn-primary' data-width='70%'")?>
+      <?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=story&params=' . helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID&storyID=$storyID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn btn-primary' data-width='70%'")?>
       <button type='button' data-toggle='modal' data-target="#importLinesModal" class="btn btn-primary"><?php echo $lang->pasteText;?></button>
       <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=story&section=custom&key=batchCreateFields')?>
       <?php include '../../common/view/customfield.html.php';?>

From afdf88d276b75a138b1b840a280f9f7458495c86 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 10 Aug 2020 17:33:42 +0800
Subject: [PATCH 6/6]  * Fix bug #3340.

---
 module/task/lang/de.php    | 3 +++
 module/task/lang/en.php    | 3 +++
 module/task/lang/fr.php    | 3 +++
 module/task/lang/vi.php    | 3 +++
 module/task/lang/zh-cn.php | 3 +++
 module/task/lang/zh-tw.php | 3 +++
 6 files changed, 18 insertions(+)

diff --git a/module/task/lang/de.php b/module/task/lang/de.php
index 4ebab40c6b..e1acf374d2 100644
--- a/module/task/lang/de.php
+++ b/module/task/lang/de.php
@@ -298,3 +298,6 @@ $lang->task->report->tasksPerClosedReason->graph->xAxisName = 'Grund';
 
 $lang->task->report->finishedTasksPerDay->type             = 'bar';
 $lang->task->report->finishedTasksPerDay->graph->xAxisName = 'Datum';
+
+$lang->taskestimate = new stdclass();
+$lang->taskestimate->consumed = 'Schätzung';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 02c190d90b..cf2e440eb3 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -298,3 +298,6 @@ $lang->task->report->tasksPerClosedReason->graph->xAxisName = 'Close Reason';
 
 $lang->task->report->finishedTasksPerDay->type             = 'bar';
 $lang->task->report->finishedTasksPerDay->graph->xAxisName = 'Date';
+
+$lang->taskestimate = new stdclass();
+$lang->taskestimate->consumed = 'Estimates';
diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php
index 731cbbfdb3..d0057e06bb 100644
--- a/module/task/lang/fr.php
+++ b/module/task/lang/fr.php
@@ -298,3 +298,6 @@ $lang->task->report->tasksPerClosedReason->graph->xAxisName = 'Raison Fermeture'
 
 $lang->task->report->finishedTasksPerDay->type             = 'bar';
 $lang->task->report->finishedTasksPerDay->graph->xAxisName = 'Date';
+
+$lang->taskestimate = new stdclass();
+$lang->taskestimate->consumed = 'Estimés';
diff --git a/module/task/lang/vi.php b/module/task/lang/vi.php
index 45dabc162f..3ec8195ed0 100644
--- a/module/task/lang/vi.php
+++ b/module/task/lang/vi.php
@@ -298,3 +298,6 @@ $lang->task->report->tasksPerClosedReason->graph->xAxisName = 'Lý do đóng';
 
 $lang->task->report->finishedTasksPerDay->type = 'bar';
 $lang->task->report->finishedTasksPerDay->graph->xAxisName = 'Ngày';
+
+$lang->taskestimate = new stdclass();
+$lang->taskestimate->consumed = 'Dự tính';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index e4914e0396..6d71b4beaa 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -298,3 +298,6 @@ $lang->task->report->tasksPerClosedReason->graph->xAxisName = '关闭原因';
 
 $lang->task->report->finishedTasksPerDay->type             = 'bar';
 $lang->task->report->finishedTasksPerDay->graph->xAxisName = '日期';
+
+$lang->taskestimate           = new stdclass();
+$lang->taskestimate->consumed = '工时';
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 6edcc33015..b5495015a7 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -298,3 +298,6 @@ $lang->task->report->tasksPerClosedReason->graph->xAxisName = '關閉原因';
 
 $lang->task->report->finishedTasksPerDay->type             = 'bar';
 $lang->task->report->finishedTasksPerDay->graph->xAxisName = '日期';
+
+$lang->taskestimate           = new stdclass();
+$lang->taskestimate->consumed = '工時';