From 55725dbcf9d46ba03bc86e8bb6471d394e3f658d Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 6 Nov 2017 17:26:51 +0800 Subject: [PATCH] * fix for get testtask. --- module/testtask/lang/zh-cn.php | 2 +- module/testtask/model.php | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index 956a6e97d4..2c9056f3a8 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -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 = '版本'; diff --git a/module/testtask/model.php b/module/testtask/model.php index b6d918f1c8..a277a8b5a9 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -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; } }