From bb34dfe79b36cb495a266dc863851a3bcf8e67dc Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Tue, 17 Nov 2020 14:04:50 +0800 Subject: [PATCH] * Finish task #8378. --- module/bug/view/browse.html.php | 6 +++--- module/bug/view/view.html.php | 2 +- module/common/model.php | 4 ++-- module/custom/control.php | 4 ++-- module/custom/lang/de.php | 8 ++++---- module/custom/lang/en.php | 8 ++++---- module/custom/lang/fr.php | 8 ++++---- module/custom/lang/vi.php | 8 ++++---- module/custom/lang/zh-cn.php | 8 ++++---- module/custom/lang/zh-tw.php | 8 ++++---- module/custom/view/product.html.php | 4 ++-- module/custom/view/project.html.php | 4 ++-- module/doc/control.php | 8 ++++---- module/product/view/browse.html.php | 6 +++--- module/product/view/roadmap.html.php | 2 +- module/productplan/view/browse.html.php | 4 ++-- module/release/view/browse.html.php | 4 ++-- module/story/view/view.html.php | 2 +- module/testcase/view/browse.html.php | 2 +- module/testcase/view/caseheader.html.php | 4 ++-- module/testcase/view/groupcase.html.php | 2 +- module/testreport/control.php | 4 ++-- module/testsuite/view/browse.html.php | 4 ++-- module/testtask/view/browse.html.php | 4 ++-- module/testtask/view/browseunits.html.php | 2 +- module/tree/control.php | 4 ++-- 26 files changed, 62 insertions(+), 62 deletions(-) diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 7b7d20c1df..150243cbfc 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -117,7 +117,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow ?> - config->global->closedProductStatus) or $product->status != 'closed'):?> + config->CRProduct) or $product->status != 'closed'):?> " . $lang->bug->batchCreate, '', "class='btn btn-secondary'"); @@ -189,7 +189,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
bug->noBug;?> - config->global->closedProductStatus) or $product->status != 'closed') and common::hasPriv('bug', 'create')):?> + config->CRProduct) or $product->status != 'closed') and common::hasPriv('bug', 'create')):?> createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID"), " " . $lang->bug->create, '', "class='btn btn-info'");?>
@@ -211,7 +211,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow $widths = $this->datatable->setFixedFieldWidth($setting); $columns = 0; - $canBeChanged = (empty($config->global->closedProductStatus) or $product->status != 'closed'); + $canBeChanged = (!empty($config->CRProduct) or $product->status != 'closed'); $canBatchEdit = ($canBeChanged and common::hasPriv('bug', 'batchEdit')); $canBatchConfirm = ($canBeChanged and common::hasPriv('bug', 'batchConfirm')); $canBatchClose = common::hasPriv('bug', 'batchClose'); diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index a79713b707..540516b9cb 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -30,7 +30,7 @@story->noStory;?> - config->global->closedProductStatus) or $product->status != 'closed') and common::hasPriv('story', 'create')):?> + config->CRProduct) or $product->status != 'closed') and common::hasPriv('story', 'create')):?> createLink('story', 'create', "productID={$productID}&branch={$branch}&moduleID={$moduleID}"), " " . $lang->story->create, '', "class='btn btn-info'");?>
@@ -189,7 +189,7 @@ js::set('foldAll', $lang->project->treeLevel['root']); $widths = $this->datatable->setFixedFieldWidth($setting); $columns = 0; - $canBeChanged = (empty($config->global->closedProductStatus) or $product->status != 'closed'); + $canBeChanged = (!empty($config->CRProduct) or $product->status != 'closed'); $canBatchEdit = ($canBeChanged and common::hasPriv('story', 'batchEdit')); $canBatchClose = (common::hasPriv('story', 'batchClose') and strtolower($browseType) != 'closedbyme' and strtolower($browseType) != 'closedstory'); $canBatchReview = ($canBeChanged and common::hasPriv('story', 'batchReview')); diff --git a/module/product/view/roadmap.html.php b/module/product/view/roadmap.html.php index 4fdeee1b9c..90ebd428d0 100644 --- a/module/product/view/roadmap.html.php +++ b/module/product/view/roadmap.html.php @@ -41,7 +41,7 @@release->noRelease;?> - config->global->closedProductStatus) or $product->status != 'closed') and common::hasPriv('release', 'create')):?> + config->CRProduct) or $product->status != 'closed') and common::hasPriv('release', 'create')):?> createLink('release', 'create', "productID=$product->id&branch=$branchKey"), " " . $lang->release->create, '', "class='btn btn-info'");?>
diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index 242a8cd17e..68e197cac0 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -24,7 +24,7 @@productplan->noPlan;?> - config->global->closedProductStatus) or $product->status != 'closed') and common::hasPriv('productplan', 'create')):?> + config->CRProduct) or $product->status != 'closed') and common::hasPriv('productplan', 'create')):?> createLink('productplan', 'create', "productID=$product->id&branch=$branch"), " " . $lang->productplan->create, '', "class='btn btn-info'");?>
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index ff8213e84f..48ddcbc5fd 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -22,7 +22,7 @@ ?>release->noRelease;?> - config->global->closedProductStatus) or $product->status != 'closed') and common::hasPriv('release', 'create')):?> + config->CRProduct) or $product->status != 'closed') and common::hasPriv('release', 'create')):?> createLink('release', 'create', "productID=$product->id&branch=$branch"), " " . $lang->release->create, '', "class='btn btn-info'");?>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index a29b2054d7..19a9a8a205 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -47,7 +47,7 @@testcase->noCase;?> - config->global->closedProductStatus) or $product->status != 'closed') and common::hasPriv('testcase', 'create')):?> + config->CRProduct) or $product->status != 'closed') and common::hasPriv('testcase', 'create')):?> createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule"), " " . $lang->testcase->create, '', "class='btn btn-info'");?> diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php index e16a07caf6..418d056822 100644 --- a/module/testcase/view/caseheader.html.php +++ b/module/testcase/view/caseheader.html.php @@ -44,7 +44,7 @@ echo "
testtask->noTesttask;?> - config->global->closedProductStatus) or $product->status != 'closed') and common::hasPriv('testtask', 'create')):?> + config->CRProduct) or $product->status != 'closed') and common::hasPriv('testtask', 'create')):?> createLink('testtask', 'create', "product=$productID"), " " . $lang->testtask->create, '', "class='btn btn-info'");?>
diff --git a/module/testtask/view/browseunits.html.php b/module/testtask/view/browseunits.html.php index 8b7840730f..fa234495f6 100644 --- a/module/testtask/view/browseunits.html.php +++ b/module/testtask/view/browseunits.html.php @@ -23,7 +23,7 @@ $label", '', "id='{$key}Tab' class='btn btn-link'");?>