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] =?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;
     }