diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php index 0c08be4a16..fceb862f67 100644 --- a/module/custom/lang/de.php +++ b/module/custom/lang/de.php @@ -210,10 +210,10 @@ $lang->custom->notice->conceptResult = 'According to your preference, $lang->custom->notice->conceptPath = 'Go to Admin -> Custom -> Concept to set it.'; $lang->custom->notice->readOnlyOfProduct = 'If Change Forbidden, any change on stories, bugs, cases, efforts, releases, plans and builds of the closed product is also forbidden.'; $lang->custom->notice->readOnlyOfProject = "If Change Forbidden, any change on {$lang->projectCommon}s is also forbidden:
-1. For {$lang->productCommon}-based {$lang->projectCommon}s with {$lang->custom->executionCommon}: The following will not be editable under closed {$lang->projectCommon}s: {$lang->custom->executionCommon}, {$lang->SRCommon}s, design, reviews, review issues, baselines, documents, versions, releases, logs, testrequest, testreports, process trimming, research, estimation, issues, risks, opportunities, meetings, quality assurance plans, non-conformities, etc.
-2. For {$lang->productCommon}-based {$lang->projectCommon}s without {$lang->custom->executionCommon}: The following will not be editable under closed {$lang->projectCommon}s: tasks, {$lang->SRCommon}s, versions, releases, logs, testrequest, testreports, documents, etc.
-3. For non-{$lang->productCommon}-based {$lang->projectCommon}s with {$lang->custom->executionCommon} enabled: The following will not be editable under closed {$lang->projectCommon}s: {$lang->custom->executionCommon}, {$lang->SRCommon}s, design, reviews, review issues, baselines, bugs, testcases, testrequest, testreports, documents, versions, releases, logs, process trimming, research, estimation, issues, risks, opportunities, meetings, quality assurance plans, non-conformities, etc.
-4. For non-{$lang->productCommon}-based {$lang->projectCommon}s without {$lang->custom->executionCommon} enabled: The following will not be editable under closed {$lang->projectCommon}s: tasks, {$lang->SRCommon}s, bugs, testcases, testrequest, testreports, documents, versions, releases, logs, etc."; +1. For {$lang->productCommon}-based {$lang->projectCommon}s with {$lang->custom->executionCommon}: The following will not be editable under closed {$lang->projectCommon}s: {$lang->custom->executionCommon}, stories, design, reviews, review issues, baselines, documents, versions, releases, logs, testrequest, testreports, process trimming, research, estimation, issues, risks, opportunities, meetings, quality assurance plans, non-conformities, etc.
+2. For {$lang->productCommon}-based {$lang->projectCommon}s without {$lang->custom->executionCommon}: The following will not be editable under closed {$lang->projectCommon}s: tasks, stories, versions, releases, logs, testrequest, testreports, documents, etc.
+3. For non-{$lang->productCommon}-based {$lang->projectCommon}s with {$lang->custom->executionCommon} enabled: The following will not be editable under closed {$lang->projectCommon}s: {$lang->custom->executionCommon}, stories, design, reviews, review issues, baselines, bugs, testcases, testrequest, testreports, documents, versions, releases, logs, process trimming, research, estimation, issues, risks, opportunities, meetings, quality assurance plans, non-conformities, etc.
+4. For non-{$lang->productCommon}-based {$lang->projectCommon}s without {$lang->custom->executionCommon} enabled: The following will not be editable under closed {$lang->projectCommon}s: tasks, stories, bugs, testcases, testrequest, testreports, documents, versions, releases, logs, etc."; if(in_array($config->edition, array('open', 'biz'))) { $lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts, test tasks, test reports, documents and stories of the closed {$lang->executionCommon} is also forbidden."; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index dc67143c9e..04a80eb86a 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -210,10 +210,10 @@ $lang->custom->notice->conceptResult = 'According to your preference, $lang->custom->notice->conceptPath = 'Go to Admin -> Custom -> Concept to set it.'; $lang->custom->notice->readOnlyOfProduct = 'If Change Forbidden, any change on stories, bugs, cases, efforts, releases, plans and builds of the closed product is also forbidden.'; $lang->custom->notice->readOnlyOfProject = "If Change Forbidden, any change on {$lang->projectCommon}s is also forbidden:
-1. For {$lang->productCommon}-based {$lang->projectCommon}s with {$lang->custom->executionCommon}: The following will not be editable under closed {$lang->projectCommon}s: {$lang->custom->executionCommon}, {$lang->SRCommon}s, design, reviews, review issues, baselines, documents, versions, releases, logs, testrequest, testreports, process trimming, research, estimation, issues, risks, opportunities, meetings, quality assurance plans, non-conformities, etc.
-2. For {$lang->productCommon}-based {$lang->projectCommon}s without {$lang->custom->executionCommon}: The following will not be editable under closed {$lang->projectCommon}s: tasks, {$lang->SRCommon}s, versions, releases, logs, testrequest, testreports, documents, etc.
-3. For non-{$lang->productCommon}-based {$lang->projectCommon}s with {$lang->custom->executionCommon} enabled: The following will not be editable under closed {$lang->projectCommon}s: {$lang->custom->executionCommon}, {$lang->SRCommon}s, design, reviews, review issues, baselines, bugs, testcases, testrequest, testreports, documents, versions, releases, logs, process trimming, research, estimation, issues, risks, opportunities, meetings, quality assurance plans, non-conformities, etc.
-4. For non-{$lang->productCommon}-based {$lang->projectCommon}s without {$lang->custom->executionCommon} enabled: The following will not be editable under closed {$lang->projectCommon}s: tasks, {$lang->SRCommon}s, bugs, testcases, testrequest, testreports, documents, versions, releases, logs, etc."; +1. For {$lang->productCommon}-based {$lang->projectCommon}s with {$lang->custom->executionCommon}: The following will not be editable under closed {$lang->projectCommon}s: {$lang->custom->executionCommon}, stories, design, reviews, review issues, baselines, documents, versions, releases, logs, testrequest, testreports, process trimming, research, estimation, issues, risks, opportunities, meetings, quality assurance plans, non-conformities, etc.
+2. For {$lang->productCommon}-based {$lang->projectCommon}s without {$lang->custom->executionCommon}: The following will not be editable under closed {$lang->projectCommon}s: tasks, stories, versions, releases, logs, testrequest, testreports, documents, etc.
+3. For non-{$lang->productCommon}-based {$lang->projectCommon}s with {$lang->custom->executionCommon} enabled: The following will not be editable under closed {$lang->projectCommon}s: {$lang->custom->executionCommon}, stories, design, reviews, review issues, baselines, bugs, testcases, testrequest, testreports, documents, versions, releases, logs, process trimming, research, estimation, issues, risks, opportunities, meetings, quality assurance plans, non-conformities, etc.
+4. For non-{$lang->productCommon}-based {$lang->projectCommon}s without {$lang->custom->executionCommon} enabled: The following will not be editable under closed {$lang->projectCommon}s: tasks, stories, bugs, testcases, testrequest, testreports, documents, versions, releases, logs, etc."; if(in_array($config->edition, array('open', 'biz'))) { $lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts, test tasks, test reports, documents and stories of the closed {$lang->executionCommon} is also forbidden."; diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php index 5eafe56aa8..537d988bb6 100644 --- a/module/custom/lang/fr.php +++ b/module/custom/lang/fr.php @@ -210,10 +210,10 @@ $lang->custom->notice->conceptResult = 'Selon votre préférence, %s-% $lang->custom->notice->conceptPath = 'Allez à Admin -> Custom -> Concept pour le paramétrer.'; $lang->custom->notice->readOnlyOfProduct = 'If Change Forbidden, any change on stories, bugs, cases, efforts, releases, plans and builds of the closed product is also forbidden.'; $lang->custom->notice->readOnlyOfProject = "If Change Forbidden, any change on {$lang->projectCommon}s is also forbidden:
-1. For {$lang->productCommon}-based {$lang->projectCommon}s with {$lang->custom->executionCommon}: The following will not be editable under closed {$lang->projectCommon}s: {$lang->custom->executionCommon}, {$lang->SRCommon}s, design, reviews, review issues, baselines, documents, versions, releases, logs, testrequest, testreports, process trimming, research, estimation, issues, risks, opportunities, meetings, quality assurance plans, non-conformities, etc.
-2. For {$lang->productCommon}-based {$lang->projectCommon}s without {$lang->custom->executionCommon}: The following will not be editable under closed {$lang->projectCommon}s: tasks, {$lang->SRCommon}s, versions, releases, logs, testrequest, testreports, documents, etc.
-3. For non-{$lang->productCommon}-based {$lang->projectCommon}s with {$lang->custom->executionCommon} enabled: The following will not be editable under closed {$lang->projectCommon}s: {$lang->custom->executionCommon}, {$lang->SRCommon}s, design, reviews, review issues, baselines, bugs, testcases, testrequest, testreports, documents, versions, releases, logs, process trimming, research, estimation, issues, risks, opportunities, meetings, quality assurance plans, non-conformities, etc.
-4. For non-{$lang->productCommon}-based {$lang->projectCommon}s without {$lang->custom->executionCommon} enabled: The following will not be editable under closed {$lang->projectCommon}s: tasks, {$lang->SRCommon}s, bugs, testcases, testrequest, testreports, documents, versions, releases, logs, etc."; +1. For {$lang->productCommon}-based {$lang->projectCommon}s with {$lang->custom->executionCommon}: The following will not be editable under closed {$lang->projectCommon}s: {$lang->custom->executionCommon}, stories, design, reviews, review issues, baselines, documents, versions, releases, logs, testrequest, testreports, process trimming, research, estimation, issues, risks, opportunities, meetings, quality assurance plans, non-conformities, etc.
+2. For {$lang->productCommon}-based {$lang->projectCommon}s without {$lang->custom->executionCommon}: The following will not be editable under closed {$lang->projectCommon}s: tasks, stories, versions, releases, logs, testrequest, testreports, documents, etc.
+3. For non-{$lang->productCommon}-based {$lang->projectCommon}s with {$lang->custom->executionCommon} enabled: The following will not be editable under closed {$lang->projectCommon}s: {$lang->custom->executionCommon}, stories, design, reviews, review issues, baselines, bugs, testcases, testrequest, testreports, documents, versions, releases, logs, process trimming, research, estimation, issues, risks, opportunities, meetings, quality assurance plans, non-conformities, etc.
+4. For non-{$lang->productCommon}-based {$lang->projectCommon}s without {$lang->custom->executionCommon} enabled: The following will not be editable under closed {$lang->projectCommon}s: tasks, stories, bugs, testcases, testrequest, testreports, documents, versions, releases, logs, etc."; if(in_array($config->edition, array('open', 'biz'))) { $lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts, test tasks, test reports, documents and stories of the closed {$lang->executionCommon} is also forbidden."; diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index 4e635b90d9..a0d81a33a8 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -210,10 +210,10 @@ $lang->custom->notice->conceptResult = '我们已经根据您的选择为 $lang->custom->notice->conceptPath = '您可以在:后台 -> 自定义 -> 流程页面修改。'; $lang->custom->notice->readOnlyOfProduct = '禁止修改后,已关闭' . $lang->productCommon . '下的' . $lang->SRCommon . '、Bug、用例、日志、发布、计划、版本都禁止修改。'; $lang->custom->notice->readOnlyOfProject = "禁止修改后,已关闭{$lang->projectCommon}下的数据将禁止修改:
-1. 产品型{$lang->projectCommon}启用{$lang->custom->executionCommon}:已关闭项目下的{$lang->custom->executionCommon}、{$lang->SRCommon}、设计、评审、评审问题、基线、文档、版本、发布、日志、测试单、测试报告、过程裁剪、调研、估算、问题、风险、机会、会议、质量保证计划、不符合项等禁止修改。
-2. 产品型{$lang->projectCommon}不启用{$lang->custom->executionCommon}:已关闭项目下的任务、{$lang->SRCommon}、版本、发布、日志、测试单、测试报告、文档等禁止修改。
-3. 项目型{$lang->projectCommon}启用{$lang->custom->executionCommon}:已关闭项目下的执行、{$lang->SRCommon}、设计、评审、评审问题、基线、Bug、用例、测试单、测试报告、文档、版本、发布、日志、过程裁剪、调研、估算、问题、风险、机会、会议、质量保证计划、不符合项等禁止修改。
-4. 项目型{$lang->projectCommon}不启用{$lang->custom->executionCommon}:已关闭项目下的任务、{$lang->SRCommon}、Bug、用例、测试单、测试报告、文档、版本、发布、日志等禁止修改。"; +1. 产品型{$lang->projectCommon}启用{$lang->custom->executionCommon}:已关闭项目下的{$lang->custom->executionCommon}、需求、设计、评审、评审问题、基线、文档、版本、发布、日志、测试单、测试报告、过程裁剪、调研、估算、问题、风险、机会、会议、质量保证计划、不符合项等禁止修改。
+2. 产品型{$lang->projectCommon}不启用{$lang->custom->executionCommon}:已关闭项目下的任务、需求、版本、发布、日志、测试单、测试报告、文档等禁止修改。
+3. 项目型{$lang->projectCommon}启用{$lang->custom->executionCommon}:已关闭项目下的执行、需求、设计、评审、评审问题、基线、Bug、用例、测试单、测试报告、文档、版本、发布、日志、过程裁剪、调研、估算、问题、风险、机会、会议、质量保证计划、不符合项等禁止修改。
+4. 项目型{$lang->projectCommon}不启用{$lang->custom->executionCommon}:已关闭项目下的任务、需求、Bug、用例、测试单、测试报告、文档、版本、发布、日志等禁止修改。"; if(in_array($config->edition, array('open', 'biz'))) { $lang->custom->notice->readOnlyOfExecution = "禁止修改后,已关闭{$lang->custom->executionCommon}下的任务、日志、版本、测试单、测试报告、文档以及关联需求等都禁止修改。"; diff --git a/module/programplan/ui/gantt.html.php b/module/programplan/ui/gantt.html.php index 40c1119622..bcba24ae75 100644 --- a/module/programplan/ui/gantt.html.php +++ b/module/programplan/ui/gantt.html.php @@ -53,7 +53,7 @@ if($app->rawModule == 'programplan') )) ), btn(set::url($this->createLink('programplan', 'ajaxcustom')), set::icon('cog-outline'), $lang->settings, setClass('no-underline'), set::type('link'), set('data-toggle', 'modal'), set('data-size', 'sm')), - (common::canModify('project', $project) && common::hasPriv('programplan', 'ocreate') && empty($product->deleted)) ? btn(set::url($this->createLink('programplan', 'create', "projectID=$projectID")), set::icon('plus'), $lang->programplan->create, setClass('primary programplan-create-btn')) : null + (common::canModify('project', $project) && common::hasPriv('programplan', 'create') && empty($product->deleted)) ? btn(set::url($this->createLink('programplan', 'create', "projectID=$projectID")), set::icon('plus'), $lang->programplan->create, setClass('primary programplan-create-btn')) : null ); } diff --git a/module/testcase/ui/header.html.php b/module/testcase/ui/header.html.php index ce71a1f64b..4717baafae 100644 --- a/module/testcase/ui/header.html.php +++ b/module/testcase/ui/header.html.php @@ -26,8 +26,9 @@ $rawMethod = $app->rawMethod; $load = $rawMethod !== 'browse' ? null : 'table'; $product = is_bool($product) ? new stdclass() : $product; -$canModify = common::canModify('product', $product); +$canModify = common::canModify('product', $product); if(!empty($project)) $canModify = $canModify && common::canModify('project', $project); + $canSwitchCaseType = $this->app->tab == 'qa'; $canDisplaySuite = $this->app->tab == 'qa' && $rawMethod != 'browseunits'; $canManageModule = $canModify && hasPriv('tree', 'browse') && !empty($productID) && (!isset($project) || $project->hasProduct);