Merge branch 'master' of https://github.com/easysoft/zentaopms
This commit is contained in:
@@ -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()));
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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'>
|
||||
|
||||
Reference in New Issue
Block a user