From 2f91b01a490000ec90b1db7b0befc107ac165c70 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 2 May 2017 09:24:49 +0800
Subject: [PATCH 1/3] =?UTF-8?q?Finish=20task#2986=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E7=9A=84=E8=AF=84=E5=AE=A1?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD,cost:1=20left:0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/custom/view/set.html.php | 20 +++++++++++++++++++-
 module/testcase/model.php       |  5 ++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php
index 24de73e42d..9f5b0ce39b 100644
--- a/module/custom/view/set.html.php
+++ b/module/custom/view/set.html.php
@@ -69,7 +69,7 @@ EOT;
           <td><?php echo html::radio('needReview', $lang->custom->reviewList, $needReview);?></td>
           <td></td>
         </tr>
-        <tr>
+        <tr <?php if($needReview and $module == 'testcase') echo "class='hidden'"?>>
           <th><?php echo $lang->custom->forceReview;?></th>
           <td><?php echo html::select('forceReview[]', $users, $forceReview, "class='form-control chosen' multiple");?></td>
           <td class='w-180px'><?php printf($lang->custom->notice->forceReview, $lang->$module->common);?></td>
@@ -160,4 +160,22 @@ EOT;
     </div>
   </form>
 </div>
+<?php if($module == 'testcase' and $field == 'review'):?>
+<script>
+$(function()
+{
+    $("input[name='needReview']").change(function()
+    {
+        if($(this).val() == 0)
+        {
+            $('#forceReview').closest('tr').removeClass('hidden');
+        }
+        else
+        {
+            $('#forceReview').closest('tr').addClass('hidden');
+        }
+    })
+})
+</script>
+<?php endif;?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 87eab58da7..1523ff5da7 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1352,12 +1352,11 @@ class testcaseModel extends model
      * Check whether force review 
      * 
      * @access public
-     * @return void
+     * @return bool
      */
     public function forceReview()
     {
-        if(!$this->config->testcase->needReview) return false;
-        if(empty($this->config->testcase->forceReview)) return true;
+        if($this->config->testcase->needReview) return true;
         if(strpos(",{$this->config->testcase->forceReview},", ",{$this->app->user->account},") !== false) return true;
         return false;
     }

From 53653b057287aa17ef7fd392ce21bf6e91cd8ba5 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 2 May 2017 10:05:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?Finish=20task#3002=20=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E7=9B=AE=E5=BD=95=E4=B9=8B=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?model=E4=B8=B4=E6=97=B6=E6=96=87=E4=BB=B6=E8=83=BD=E5=A4=9F?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E3=80=82?=
 =?UTF-8?q?,cost:1=20left:0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/base/helper.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/framework/base/helper.class.php b/framework/base/helper.class.php
index df9946f0cb..c6bdcd99ff 100644
--- a/framework/base/helper.class.php
+++ b/framework/base/helper.class.php
@@ -226,7 +226,10 @@ class baseHelper
         $extModelClass    = 'ext' . $modelClass;
         $extTmpModelClass = 'tmpExt' . $modelClass;
         $modelLines       = "<?php\n";
-        $modelLines      .= "helper::import('$mainModelFile');\n";
+        $modelLines      .= "global \$app;\n";
+        $modelLines      .= "helper::cd(\$app->getBasePath());\n";
+        $modelLines      .= "helper::import('" . str_replace($app->getBasePath(), '.' . DS, $mainModelFile) . "');\n";
+        $modelLines      .= "helper::cd();\n";
         $modelLines      .= "class $extTmpModelClass extends $modelClass \n{\n";
 
         /* Cycle all the extension files. */

From c4b150c4beeb5e2e65873bee51d856825a084b04 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Tue, 2 May 2017 11:00:22 +0800
Subject: [PATCH 3/3]  * finish task #3011.

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

diff --git a/module/story/model.php b/module/story/model.php
index 0aa6279f77..a9d1a13304 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -1308,6 +1308,7 @@ class storyModel extends model
      */
     public function getProductStoryPairs($productID = 0, $branch = 0, $moduleIdList = 0, $status = 'all', $order = 'id_desc', $limit = 0)
     {
+        if($branch) $branch = "0,$branch";//Fix bug 1059.
         $stories = $this->dao->select('t1.id, t1.title, t1.module, t1.pri, t1.estimate, t2.name AS product')
             ->from(TABLE_STORY)->alias('t1')->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
             ->where('1=1')