* fix for get testtask.

This commit is contained in:
wangyidong
2017-11-06 17:26:51 +08:00
parent 7293086b45
commit 55725dbcf9
2 changed files with 1 additions and 19 deletions
+1 -1
View File
@@ -42,7 +42,7 @@ $lang->testtask->totalStatus = "全部";
$lang->testtask->all = "全部" . $lang->productCommon;
$lang->testtask->id = '编号';
$lang->testtask->common = '测试版本';
$lang->testtask->common = '测试单';
$lang->testtask->product = '所属' . $lang->productCommon;
$lang->testtask->project = '所属' . $lang->projectCommon;
$lang->testtask->build = '版本';
-18
View File
@@ -138,24 +138,6 @@ class testtaskModel extends model
->fetchAll('id');
$projectTeam = $this->dao->select('project, account')->from(TABLE_TEAM)->where('account')->eq($this->app->user->account)->fetchAll('project');
foreach($testTask as $id => $task)
{
if($this->app->user->admin) break;
if($task->acl == 'open') continue;
if($task->acl == 'private' && array_key_exists($task->project, $projectTeam)) continue;
if($task->acl == 'custom')
{
$whiteListArray = array();
if(!empty($task->whitelist)) $whiteListArray = explode(',', $task->whitelist);
$intersect = array_intersect($whiteListArray, $this->app->user->groups);
if(!empty($intersect)) continue;
}
unset($testTask[$id]);
}
return $testTask;
}
}