From 9a636b34c4f3ffa2d83493a700945420ad65e1bc Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Fri, 15 Apr 2016 16:23:58 +0800
Subject: [PATCH 1/2] * fix bug #825.

---
 module/testtask/control.php         | 1 +
 module/testtask/view/cases.html.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index ec8be4d5be..01dc4e72da 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -318,6 +318,7 @@ class testtask extends control
         $this->view->productName   = $this->products[$productID];
         $this->view->task          = $task;
         $this->view->users         = $this->loadModel('user')->getPairs('noclosed,qafirst');
+        $this->view->assignedTos   = $this->loadModel('user')->getPairs('noclosed,nodeleted,qafirst');
         $this->view->moduleTree    = $this->loadModel('tree')->getTreeMenu($productID, $viewType = 'case', $startModuleID = 0, array('treeModel', 'createTestTaskLink'), $extra = $taskID);
         $this->view->browseType    = $browseType;
         $this->view->param         = $param;
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index 62b071b971..60b0c1ba43 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -58,7 +58,7 @@ include $useDatatable ? dirname(__FILE__) . '/datatabledata.html.php' : dirname(
             {
                 $actionLink = inLink('batchAssign', "taskID=$task->id");
                 echo "<div class='input-group w-200px'>";
-                echo html::select('assignedTo', $users, '', 'class="form-control chosen"');
+                echo html::select('assignedTo', $assignedTos, '', 'class="form-control chosen"');
                 echo "<span class='input-group-addon'>";
                 echo html::a("javascript:setFormAction(\"$actionLink\")", $lang->testtask->assign);
                 echo '</span></div>';

From 974d6157879f991a79f89627a3ed691f9eb3d3ba Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Fri, 15 Apr 2016 16:26:25 +0800
Subject: [PATCH 2/2] * fix error for SQL when printing build block.

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

diff --git a/module/block/control.php b/module/block/control.php
index ca8e86d073..2749c70c77 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -527,7 +527,7 @@ class block extends control
     {
         $this->app->loadLang('build');
         $projects = $this->loadModel('project')->getPairs();
-        $this->view->builds = $this->dao->select('t1.*,t2.productName')->from(TABLE_BUILD)->alias('t1')
+        $this->view->builds = $this->dao->select('t1.*, t2.name as productName')->from(TABLE_BUILD)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
             ->where('t1.deleted')->eq('0')
             ->andWhere('t1.project')->in(array_keys($projects))