From 6b92b40e4ce7d0595889630971dc98048668982e Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Mon, 9 Nov 2015 15:10:48 +0800 Subject: [PATCH 1/3] * remove back button for manage method of branch. --- module/branch/view/manage.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/branch/view/manage.html.php b/module/branch/view/manage.html.php index 08950c3312..88d559af0d 100644 --- a/module/branch/view/manage.html.php +++ b/module/branch/view/manage.html.php @@ -41,7 +41,7 @@ - + From 225270d39bf53cedc5aab25b2d6bdcfcb9d16762 Mon Sep 17 00:00:00 2001 From: daitingting Date: Mon, 9 Nov 2015 16:02:07 +0800 Subject: [PATCH 2/3] * Check privilage. --- module/sso/control.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/sso/control.php b/module/sso/control.php index 50ecd4192a..6873a2bad4 100644 --- a/module/sso/control.php +++ b/module/sso/control.php @@ -127,6 +127,8 @@ class sso extends control */ public function ajaxSetConfig() { + if(!common::hasPriv('admin', 'sso')) die('fail'); + if($_POST) { $ssoConfig = new stdclass(); From fe99321c4533a3b3a69f63c8b0a370b270efa14d Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Tue, 10 Nov 2015 10:43:23 +0800 Subject: [PATCH 3/3] * finish task #2396. --- module/common/lang/en.php | 4 ++-- module/common/lang/zh-cn.php | 4 ++-- module/common/lang/zh-tw.php | 4 ++-- module/my/view/testcase.html.php | 2 +- module/testcase/view/browse.html.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 9ffb204d19..d18b4619fa 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -452,13 +452,13 @@ $lang->icons['dept'] = 'sitemap'; $lang->icons['tree'] = 'sitemap'; $lang->icons['usecase'] = 'sitemap'; $lang->icons['testcase'] = 'smile'; -$lang->icons['result'] = 'flag-checkered'; +$lang->icons['result'] = 'list-alt'; $lang->icons['mail'] = 'envelope'; $lang->icons['trash'] = 'trash'; $lang->icons['extension'] = 'th-large'; $lang->icons['app'] = 'th-large'; -$lang->icons['results'] = 'flag-checkered'; +$lang->icons['results'] = 'list-alt'; $lang->icons['create'] = 'plus'; $lang->icons['post'] = 'edit'; $lang->icons['batchCreate'] = 'plus-sign'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 6596ec986d..d52e9396de 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -452,13 +452,13 @@ $lang->icons['dept'] = 'sitemap'; $lang->icons['tree'] = 'sitemap'; $lang->icons['usecase'] = 'sitemap'; $lang->icons['testcase'] = 'smile'; -$lang->icons['result'] = 'flag-checkered'; +$lang->icons['result'] = 'list-alt'; $lang->icons['mail'] = 'envelope'; $lang->icons['trash'] = 'trash'; $lang->icons['extension'] = 'th-large'; $lang->icons['app'] = 'th-large'; -$lang->icons['results'] = 'flag-checkered'; +$lang->icons['results'] = 'list-alt'; $lang->icons['create'] = 'plus'; $lang->icons['post'] = 'edit'; $lang->icons['batchCreate'] = 'plus-sign'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index f0f8ed2e50..a83ef3cab6 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -452,13 +452,13 @@ $lang->icons['dept'] = 'sitemap'; $lang->icons['tree'] = 'sitemap'; $lang->icons['usecase'] = 'sitemap'; $lang->icons['testcase'] = 'smile'; -$lang->icons['result'] = 'flag-checkered'; +$lang->icons['result'] = 'list-alt'; $lang->icons['mail'] = 'envelope'; $lang->icons['trash'] = 'trash'; $lang->icons['extension'] = 'th-large'; $lang->icons['app'] = 'th-large'; -$lang->icons['results'] = 'flag-checkered'; +$lang->icons['results'] = 'list-alt'; $lang->icons['create'] = 'plus'; $lang->icons['post'] = 'edit'; $lang->icons['batchCreate'] = 'plus-sign'; diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php index 44213c6c06..ab9c22a587 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -64,7 +64,7 @@ id&version=$case->version", '', 'list', 'play', '', 'iframe'); - common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', 'flag-checkered', '', 'iframe'); + common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', 'list-alt', '', 'iframe'); common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list', 'pencil'); common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase¶m=$case->id", $case, 'list', 'copy'); diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 3fca448869..1927abe6a3 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -80,7 +80,7 @@ js::set('batchDelete', $lang->testcase->confirmBatchDelete); id&version=$case->version", '', 'list', 'play', '', 'runCase iframe'); - common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', 'flag-checkered', '', 'results iframe'); + common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', 'list-alt', '', 'results iframe'); common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list'); common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase¶m=$case->id", $case, 'list', 'copy');