Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
reneeteng
2019-04-19 10:36:19 +08:00
parent 9cad7d87d2 618a3239b3
commit 5e6f7b93e2
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+1 -1
View File
@@ -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()));
module/testcase/model.php
+1 -1
View File
@@ -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;
}
module/testcase/view/review.html.php
+1 -1
View File
@@ -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'>
module/tree/view/browse.html.php
+1 -1
View File
@@ -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)';?>