From b28978b34fe88c34cf9f654f2f59453bc54a993c Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 24 Mar 2017 10:17:23 +0800 Subject: [PATCH] * adjust for testsuite and testreport priv. --- module/common/lang/en.php | 2 ++ module/common/lang/zh-cn.php | 2 ++ module/common/lang/zh-tw.php | 2 ++ module/testreport/control.php | 12 ++++++------ module/testsuite/control.php | 5 +++++ 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index d6c4ee4065..3353533299 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -122,6 +122,8 @@ $lang->searchObjects['release'] = 'Release'; $lang->searchObjects['productplan'] = $lang->productCommon . 'Plan'; $lang->searchObjects['testtask'] = 'Test Task'; $lang->searchObjects['doc'] = 'Document'; +$lang->searchObjects['caselib'] = 'Case Library'; +$lang->searchObjects['testreport'] = 'Test Report'; $lang->searchTips = 'ID (ctrl+g)'; /* 导入支持的编码格式。*/ diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index da46478077..7b01381bc1 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -122,6 +122,8 @@ $lang->searchObjects['release'] = '发布'; $lang->searchObjects['productplan'] = $lang->productCommon . '计划'; $lang->searchObjects['testtask'] = '测试版本'; $lang->searchObjects['doc'] = '文档'; +$lang->searchObjects['caselib'] = '用例库'; +$lang->searchObjects['testreport'] = '测试报告'; $lang->searchTips = '编号(ctrl+g)'; /* 导入支持的编码格式。*/ diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index c9ea25e0e1..a60d6e3518 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -122,6 +122,8 @@ $lang->searchObjects['release'] = '發佈'; $lang->searchObjects['productplan'] = $lang->productCommon . '計劃'; $lang->searchObjects['testtask'] = '測試版本'; $lang->searchObjects['doc'] = '文檔'; +$lang->searchObjects['caselib'] = '用例庫'; +$lang->searchObjects['testreport'] = '測試報告'; $lang->searchTips = '編號(ctrl+g)'; /* 導入支持的編碼格式。*/ diff --git a/module/testreport/control.php b/module/testreport/control.php index 2ac48782d8..9c975bff6d 100644 --- a/module/testreport/control.php +++ b/module/testreport/control.php @@ -119,7 +119,7 @@ class testreport extends control { $task = $this->testtask->getById($objectID); $productID = $this->commonAction($task->product, 'product'); - if($productID != $task->product) die('deny access'); + if($productID != $task->product) die(js::error($this->lang->error->accessDenied) . js::locate('back')); $productIdList[$productID] = $productID; $begin = $task->begin; @@ -151,7 +151,7 @@ class testreport extends control elseif($objectType == 'project') { $projectID = $this->commonAction($objectID, 'project'); - if($projectID != $objectID) die('deny access'); + if($projectID != $objectID) die(js::error($this->lang->error->accessDenied) . js::locate('back')); $project = $this->project->getById($projectID); $tasks = $this->testtask->getProjectTasks($projectID); @@ -236,7 +236,7 @@ class testreport extends control { $product = $this->product->getById($report->product); $productID = $this->commonAction($report->product, 'product'); - if($productID != $report->product) die('deny access'); + if($productID != $report->product) die(js::error($this->lang->error->accessDenied) . js::locate('back')); $browseLink = inlink('browse', "objectID=$productID&objectType=product"); $this->view->position[] = html::a($browseLink, $product->name); @@ -245,7 +245,7 @@ class testreport extends control else { $projectID = $this->commonAction($report->project, 'project'); - if($projectID != $report->objectID) die('deny access'); + if($projectID != $report->objectID) die(js::error($this->lang->error->accessDenied) . js::locate('back')); $browseLink = inlink('browse', "objectID=$projectID&objectType=project"); $this->view->position[] = html::a($browseLink, $project->name); @@ -325,7 +325,7 @@ class testreport extends control { $product = $this->product->getById($report->product); $productID = $this->commonAction($report->product, 'product'); - if($productID != $report->product) die('deny access'); + if($productID != $report->product) die(js::error($this->lang->error->accessDenied) . js::locate('back')); $browseLink = inlink('browse', "objectID=$productID&objectType=product"); $this->view->position[] = html::a($browseLink, $product->name); @@ -333,7 +333,7 @@ class testreport extends control else { $projectID = $this->commonAction($report->project, 'project'); - if($projectID != $report->objectID) die('deny access'); + if($projectID != $report->objectID) die(js::error($this->lang->error->accessDenied) . js::locate('back')); $browseLink = inlink('browse', "objectID=$projectID&objectType=project"); $this->view->position[] = html::a($browseLink, $project->name); diff --git a/module/testsuite/control.php b/module/testsuite/control.php index 65a7670dfb..30a4aa6dc4 100644 --- a/module/testsuite/control.php +++ b/module/testsuite/control.php @@ -113,6 +113,7 @@ class testsuite extends control /* Get test suite, and set menu. */ $suite = $this->testsuite->getById($suiteID, true); if(!$suite) die(js::error($this->lang->notFound) . js::locate('back')); + if($suite->type == 'private' and $suite->addedBy != $this->app->user->account and !$this->app->user->admin) die(js::error($this->lang->error->accessDenied) . js::locate('back')); $productID = $suite->product; $this->view->products = $this->products = $this->loadModel('product')->getPairs('nocode'); @@ -182,6 +183,8 @@ class testsuite extends control } else { + if($suite->type == 'private' and $suite->addedBy != $this->app->user->account and !$this->app->user->admin) die(js::error($this->lang->error->accessDenied) . js::locate('back')); + /* Get suite info. */ $this->view->products = $this->products = $this->loadModel('product')->getPairs('nocode'); $productID = $this->product->saveState($suite->product, $this->products); @@ -216,6 +219,8 @@ class testsuite extends control } else { + if($suite->type == 'private' and $suite->addedBy != $this->app->user->account and !$this->app->user->admin) die(js::error($this->lang->error->accessDenied) . js::locate('back')); + $this->testsuite->delete($suiteID); /* if ajax request, send result. */