From 618a3239b3387fa8f0f1476b9652dc2151d2005c Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 19 Apr 2019 10:21:32 +0800
Subject: [PATCH]  * fix bug.

---
 module/testcase/control.php          | 2 +-
 module/testcase/model.php            | 2 +-
 module/testcase/view/review.html.php | 2 +-
 module/tree/view/browse.html.php     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index 26aeb361fa..7574276919 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -792,7 +792,7 @@ class testcase extends control
     public function batchReview($result)
     {
         $caseIdList = $this->post->caseIDList ? $this->post->caseIDList : die(js::locate($this->session->caseList, 'parent'));
-        $caseIDList = array_unique($caseIDList);
+        $caseIdList = array_unique($caseIdList);
         $actions    = $this->testcase->batchReview($caseIdList, $result);
 
         if(dao::isError()) die(js::error(dao::getError()));
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 74cc3e397e..1a1aaf8761 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1555,7 +1555,7 @@ class testcaseModel extends model
             if(!isset($this->config->testcase->forceReview)) return true;
             if(strpos(",{$this->config->testcase->forceReview},", ",{$this->app->user->account},") === false) return true;
         }
-        if($this->config->testcase->needReview && strpos(",{$this->config->testcase->forceNotReview},", ",{$this->app->user->account},")) return true;
+        if($this->config->testcase->needReview && strpos(",{$this->config->testcase->forceNotReview},", ",{$this->app->user->account},") !== false) return true;
 
         return false;
     }
diff --git a/module/testcase/view/review.html.php b/module/testcase/view/review.html.php
index c115c40637..483bf4c18f 100644
--- a/module/testcase/view/review.html.php
+++ b/module/testcase/view/review.html.php
@@ -18,7 +18,7 @@
   <div class='main-header'>
     <h2>
       <span class='label label-id'><?php echo $case->id;?></span>
-      <?php echo html::a($this->createLink('case', 'view', "caseID=$case->id"), $case->title);?>
+      <?php echo html::a($this->createLink('testcase', 'view', "caseID=$case->id"), $case->title);?>
     </h2>
   </div>
   <form method='post' target='hiddenwin'>
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index f0ddad74e4..ba380cf525 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -15,7 +15,7 @@
 <?php $this->app->loadLang('doc');?>
 <?php $hasBranch = (strpos('story|bug|case', $viewType) !== false and (!empty($root->type) && $root->type != 'normal')) ? true : false;?>
 <?php $name = $viewType == 'line' ? $lang->tree->line : (($viewType == 'doc' or $viewType == 'feedback') ? $lang->tree->cate : $lang->tree->name);?>
-<?php $title = $viewType == 'line' or $viewType == 'trainskill' ? '' : ((strpos($viewType, 'doc') !== false || strpos($viewType, 'feedback') !== false) ? $lang->doc->childType : $lang->tree->child);?>
+<?php $title = ($viewType == 'line' or $viewType == 'trainskill') ? '' : ((strpos($viewType, 'doc') !== false || strpos($viewType, 'feedback') !== false) ? $lang->doc->childType : $lang->tree->child);?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php $backLink = $this->session->{$viewType . 'List'} ? $this->session->{$viewType . 'List'} : 'javascript:history.go(-1)';?>