From df4580208e2030d42106227f2bdb115e44a9460e Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Tue, 30 Apr 2019 14:40:40 +0800
Subject: [PATCH 1/2] * Fix export sql bug.

---
 module/story/control.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/story/control.php b/module/story/control.php
index 0cdddbf495..4cbe235d0b 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1453,7 +1453,8 @@ class story extends control
             }
             else
             {
-                $stmt = $this->dbh->query($this->session->storyQueryCondition . ($this->post->exportType == 'selected' ? " AND t1.id IN({$this->cookie->checkedItem})" : '') . " ORDER BY " . strtr($orderBy, '_', ' '));
+                $field = $projectID ? 't2.id' : 't1.id';
+                $stmt  = $this->dbh->query($this->session->storyQueryCondition . ($this->post->exportType == 'selected' ? " AND $field IN({$this->cookie->checkedItem})" : '') . " ORDER BY " . strtr($orderBy, '_', ' '));
                 while($row = $stmt->fetch()) $stories[$row->id] = $row;
             }
 

From 94aa0ca8a6369c797c34ec9ead1f04cd4a110e94 Mon Sep 17 00:00:00 2001
From: yfl <554665488@qq.com>
Date: Sun, 5 May 2019 08:38:23 +0800
Subject: [PATCH 2/2] * Finish task #5443,#5442,#5441

---
 module/action/lang/zh-cn.php          |  6 ++++++
 module/action/model.php               |  4 ++--
 module/bug/model.php                  |  9 ++++-----
 module/release/control.php            |  7 +------
 module/task/css/batchcreate.css       |  3 ++-
 module/task/lang/zh-cn.php            |  5 -----
 module/task/model.php                 |  9 ++++-----
 module/task/view/batchcreate.html.php |  2 +-
 module/task/view/view.html.php        |  2 +-
 module/testcase/control.php           |  5 ++---
 module/testcase/view/view.html.php    |  2 +-
 module/testtask/model.php             | 10 +++++++++-
 module/todo/css/view.css              |  2 +-
 module/todo/view/view.html.php        |  4 +---
 14 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 9618185b8c..9fc58645a3 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -129,6 +129,12 @@ $lang->action->desc->diff2          = '修改了 <strong><i>%s</i></strong>，
 $lang->action->desc->diff3          = '将文件名 %s 改为 %s 。' . "\n";
 $lang->action->desc->linked2bug     = '$date 由 <strong>$actor</strong> 关联到版本 <strong>$extra</strong>';
 
+/* 子任务修改父任务的历史操作记录 */
+
+$lang->action->desc->linkchildtask      = '$date, 由 <strong>$actor</strong> 关联子任务 <strong>$extra</strong>。' . "\n";
+$lang->action->desc->unlinkchildrentask = '$date, 由 <strong>$actor</strong> 移除子任务 <strong>$extra</strong>。' . "\n";
+$lang->action->desc->linkparenttask     = '$date, 由 <strong>$actor</strong> 关联父任务 <strong>$extra</strong>。' . "\n";
+
 /* 关联用例和移除用例时的历史操作记录。*/
 $lang->action->desc->linkrelatedcase   = '$date, 由 <strong>$actor</strong> 关联相关用例 <strong>$extra</strong>。' . "\n";
 $lang->action->desc->unlinkrelatedcase = '$date, 由 <strong>$actor</strong> 移除相关用例 <strong>$extra</strong>。' . "\n";
diff --git a/module/action/model.php b/module/action/model.php
index d084732e27..83b237709d 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -291,7 +291,7 @@ class actionModel extends model
                 $title = $this->dao->select('title')->from(TABLE_STORY)->where('id')->eq($action->extra)->fetch('title');
                 if($title) $action->extra = common::hasPriv('story', 'view') ? html::a(helper::createLink('story', 'view', "storyID=$action->extra"), "#$action->extra " . $title) : "#$action->extra " . $title;
             }
-            elseif($actionName == 'totask')
+            elseif($actionName == 'totask' or  $actionName == 'linkchildtask' or $actionName == 'unlinkchildrentask' or $actionName == 'linkparenttask')
             {
                 $name = $this->dao->select('name')->from(TABLE_TASK)->where('id')->eq($action->extra)->fetch('name');
                 if($name) $action->extra = common::hasPriv('task', 'view') ? html::a(helper::createLink('task', 'view', "taskID=$action->extra"), "#$action->extra " . $name) : "#$action->extra " . $name;
@@ -365,7 +365,7 @@ class actionModel extends model
                     if($history->field == 'git') $history->diff = str_replace('+', '%2B', $history->diff);
                 }
             }
-
+            
             $action->comment = $this->file->setImgSize($action->comment, $this->config->action->commonImgSize);
             $actions[$actionID] = $action;
         }
diff --git a/module/bug/model.php b/module/bug/model.php
index 385b1ca51f..cd81273fda 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -1670,13 +1670,12 @@ class bugModel extends model
     {
         $datas = $this->dao->select('openedBuild as name, count(openedBuild) as value')->from(TABLE_BUG)->where($this->reportCondition())->groupBy('openedBuild')->orderBy('value DESC')->fetchAll('name');
         if(!$datas) return array();
+        /* Judge if all product or not. */
         $products = $this->session->product;
-        preg_match('/`product` IN \((?P<productIds>.+)\)/', $this->reportCondition(), $matchs);
-        if(!empty($matchs) and isset($matchs['productIds']))
-        {
-            $products = strtr($matchs['productIds'], array('\'' => ''));
-        }
+        preg_match('/`product` IN \((?P<productIdList>.+)\)/', $this->reportCondition(), $matchs);
+        if(!empty($matchs) and isset($matchs['productIdList'])) $products = str_replace('\'', '', $matchs['productIdList']);
         $builds = $this->loadModel('build')->getProductBuildPairs($products, $branch = 0, $params = '');
+
         /* Deal with the situation that a bug maybe associate more than one openedBuild. */
         foreach($datas as $buildIDList => $data)
         {
diff --git a/module/release/control.php b/module/release/control.php
index cc1435deb0..046a5da42e 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -137,14 +137,9 @@ class release extends control
         $release = $this->release->getById((int)$releaseID, true);
         if(!$release) die(js::error($this->lang->notFound) . js::locate('back'));
         
-        $stories = array();
-        /*task 5379*/
-        if($link == 'false')
-        {
-            $stories = $this->dao->select('*')->from(TABLE_STORY)->where('id')->in($release->stories)->andWhere('deleted')->eq(0)
+        $stories = $this->dao->select('*')->from(TABLE_STORY)->where('id')->in($release->stories)->andWhere('deleted')->eq(0)
                 ->beginIF($type == 'story')->orderBy($orderBy)->fi()
                 ->fetchAll('id');
-        }
 
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story');
         $stages = $this->dao->select('*')->from(TABLE_STORYSTAGE)->where('story')->in($release->stories)->andWhere('branch')->eq($release->branch)->fetchPairs('story', 'stage');
diff --git a/module/task/css/batchcreate.css b/module/task/css/batchcreate.css
index b6a4e45fb4..5bfd430e85 100644
--- a/module/task/css/batchcreate.css
+++ b/module/task/css/batchcreate.css
@@ -2,6 +2,7 @@
 .chosen-container[id^="story"] .chosen-drop {min-width: 450px !important;}
 .chosen-container[id^="module"] .chosen-drop {min-width: 400px !important;}
 [id^=name] {min-width: 165px;}
+#mainContent .main-header h2{max-width:300px}
 
 #batchCreateForm .input-group,
 #batchCreateForm .input-group .form-control {position: static;}
@@ -18,4 +19,4 @@
 .chosen-results > li.has-task,
 .chosen-results > li.has-new-task {position: relative; color: #388E3C;}
 .chosen-results > li.has-task.highlighted,
-.chosen-results > li.has-new-task.highlighted {color: #fff;}
\ No newline at end of file
+.chosen-results > li.has-new-task.highlighted {color: #fff;}
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 1fc693465c..3670c92e33 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -274,8 +274,3 @@ $lang->task->report->tasksPerClosedReason->graph->xAxisName = '关闭原因';
 
 $lang->task->report->finishedTasksPerDay->type             = 'bar';
 $lang->task->report->finishedTasksPerDay->graph->xAxisName = '日期';
-
-$lang->task->action = new stdclass();
-$lang->task->action->batchcreate = array('main' => '$date, 由 <strong>$actor</strong> 创建子任务 。');
-$lang->task->action->unlink      = array('main' => '$date, 由 <strong>$actor</strong> 取消关联父任务 。');
-$lang->task->action->linkto      = array('main' => '$date, 由 <strong>$actor</strong> 关联到父任务 。');
diff --git a/module/task/model.php b/module/task/model.php
index 3e8e9355eb..5db36c26db 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -679,10 +679,9 @@ class taskModel extends model
 
         if(isset($task->parent) and $task->parent != $oldTask->parent)
         {
-            $comment = html::a(helper::createLink('task', 'view', 'taskID=' . $taskID), $task->name);
-            $this->loadModel('action')->create('task', $task->parent, 'linkTo', $comment);
-            $this->loadModel('action')->create('task', $oldTask->parent, 'unLink', $comment);
-        
+            $this->loadModel('action')->create('task', $task->parent, 'linkChildTask', '', $taskID);
+            $this->loadModel('action')->create('task', $oldTask->parent, 'unLinkChildrenTask', '', $taskID);
+            $this->loadModel('action')->create('task', $taskID, 'linkParentTask', '', $task->parent);
         }
 
         $task = $this->loadModel('file')->processImgURL($task, $this->config->task->editor->edit['id'], $this->post->uid);
@@ -751,7 +750,7 @@ class taskModel extends model
         if($oldTask->parent > 0)
         {
             if($task->parent == 0) $this->computeWorkingHours($oldTask->parent);
-            $this->updateParentStatus($taskID);
+            $this->updateParentStatus($taskID, false);
             $this->computeBeginAndEnd($oldTask->parent);
         }
 
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index 2151d50848..ee225a0991 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -14,7 +14,7 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <div id="mainContent" class="main-content fade">
   <div class="main-header clearfix">
-    <h2 class="pull-left" style='max-width:300px'>
+    <h2 class="pull-left">
       <?php if($parent):?>
       <span class='pull-left'><?php echo $parentTitle . $this->lang->colon;?></span> 
       <?php echo $lang->task->batchCreateChildren;?>
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index dd6638d532..5d811ce460 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -152,6 +152,7 @@
         <?php if(!isonlybody()) echo "<div class='divider'></div>";?>
         <?php if(!$task->deleted):?>
         <?php
+                  if(empty($task->team) or empty($task->children)) common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id", $task, 'button', 'treemap-alt', '', '', '', "title='{$lang->task->children}'", $lang->task->children);
         common::printIcon('task', 'assignTo',       "projectID=$task->project&taskID=$task->id", $task, 'button', '', '', 'iframe', true, '', empty($task->team) ? $lang->task->assignTo : $lang->task->transfer);
         common::printIcon('task', 'start',          "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
         common::printIcon('task', 'restart',        "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
@@ -163,7 +164,6 @@
         common::printIcon('task', 'cancel',         "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
 
         if(!isonlybody()) echo "<div class='divider'></div>";
-        if(empty($task->team) or empty($task->children)) common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id", $task, 'button', 'treemap-alt', '', '', '', "title='{$lang->task->children}' target='__blank'", ' ');
         common::printIcon('task', 'edit', "taskID=$task->id", $task, 'button', '', '', 'showinonlybody');
         common::printIcon('task', 'create', "projctID={$task->project}&storyID=0&moduleID=0&taskID=$task->id", $task, 'button', 'copy');
         common::printIcon('task', 'delete', "projectID=$task->project&taskID=$task->id", $task, 'button', 'trash', 'hiddenwin');
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 4ca20b8a80..c26725fe0c 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -807,16 +807,15 @@ class testcase extends control
      * @access public
      * @return void
      */
-    public function delete($caseID, $runID ,$confirm = 'no')
+    public function delete($caseID, $confirm = 'no')
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->testcase->confirmDelete, inlink('delete', "caseID=$caseID&runID=$runID&confirm=yes")));
+            die(js::confirm($this->lang->testcase->confirmDelete, inlink('delete', "caseID=$caseID&confirm=yes")));
         }
         else
         {
             $this->testcase->delete(TABLE_CASE, $caseID);
-            $this->dao->delete()->from(TABLE_TESTRUN)->where('id')->eq($runID)->exec();
             /* if ajax request, send result. */
             if($this->server->ajax)
             {
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index d06eb311b2..9067b0ff5c 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -117,7 +117,7 @@
         common::printIcon('testcase', 'edit',"caseID=$case->id", $case);
         if(!$isLibCase) common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$case->id", $case, 'button', 'copy');
         if($isLibCase and common::hasPriv('testsuite', 'createCase')) echo html::a($this->createLink('testsuite', 'createCase', "libID=$case->lib&moduleID=$case->module&param=$case->id", $case), "<i class='icon-copy'></i>", '', "class='btn' title='{$lang->testcase->copy}'");
-        common::printIcon('testcase', 'delete', "caseID=$case->id&runID=$runID", $case, 'button', 'trash', 'hiddenwin');
+        common::printIcon('testcase', 'delete', "caseID=$case->id", $case, 'button', 'trash', 'hiddenwin');
         ?>
         <?php endif;?>
       </div>
diff --git a/module/testtask/model.php b/module/testtask/model.php
index a277c34966..5e19043407 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -499,7 +499,15 @@ class testtaskModel extends model
      */
     public function getDataOfTestTaskPerRunResult($taskID)
     {
-        $datas = $this->dao->select('lastRunResult AS name, COUNT(*) AS value')->from(TABLE_TESTRUN)->where('task')->eq($taskID)->groupBy('name')->orderBy('value DESC')->fetchAll('name');
+        $datas = $this->dao->select("t1.lastRunResult AS name, COUNT('t1.*') AS value")->from(TABLE_TESTRUN)->alias('t1')
+            ->leftJoin(TABLE_CASE)->alias('t2')
+            ->on('t1.case = t2.id')
+            ->where('t1.task')->eq($taskID)
+            ->andWhere('t2.deleted')->eq(0)
+            ->groupBy('name')
+            ->orderBy('value DESC')
+            ->fetchAll('name');
+
         if(!$datas) return array();
 
         foreach($datas as $result => $data) $data->name = isset($this->lang->testcase->resultList[$result])? $this->lang->testcase->resultList[$result] : $this->lang->testtask->unexecuted;
diff --git a/module/todo/css/view.css b/module/todo/css/view.css
index c304e2aaa6..b978984d1f 100644
--- a/module/todo/css/view.css
+++ b/module/todo/css/view.css
@@ -1,2 +1,2 @@
 #projectModal .modal-dialog, #productModal .modal-dialog {top: auto!important; bottom: 90px;}
-.body-modal #projectModal .modal-dialog, .body-modal #productModal .modal-dialog {top: auto!important; bottom: 55px;}
\ No newline at end of file
+.body-modal #projectModal .modal-dialog, .body-modal #productModal .modal-dialog {top: auto!important; bottom: 55px;}
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index c2f95e8ca6..65cf7e84e2 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -243,8 +243,6 @@
 <?php echo $lang->todo->thisIsPrivate;?>
 <?php endif;?>
 <script>
-    $(function(){
-        parent.$('body.hide-modal-close').removeClass('hide-modal-close');
-    })
+    $(function() { parent.$('body.hide-modal-close').removeClass('hide-modal-close'); })
 </script>
 <?php include '../../common/view/footer.html.php';?>