From 7a9bfdefde177e71e98910070ddb86b4ebed93de Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Fri, 31 May 2024 09:57:24 +0800 Subject: [PATCH] * [bug#49934] Add the label of feedback for feedback module. --- lib/zin/wg/treeeditor/v1.php | 2 +- module/tree/ui/browse.html.php | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/zin/wg/treeeditor/v1.php b/lib/zin/wg/treeeditor/v1.php index ab47084208..beacde3a24 100644 --- a/lib/zin/wg/treeeditor/v1.php +++ b/lib/zin/wg/treeeditor/v1.php @@ -57,7 +57,7 @@ class treeEditor extends wg $canSplit = $this->prop('canSplit'); $editType = $this->prop('type'); $selected = $this->prop('selected'); - $typeList = array('task' => 'T', 'bug' => 'B', 'case' => 'C'); + $typeList = array('task' => 'T', 'bug' => 'B', 'case' => 'C', 'feedback' => 'F', 'ticket' => 'T'); $viewType = data('viewType') ? data('viewType') : ''; $sortTree = $this->prop('sortable') || $this->prop('onSort'); diff --git a/module/tree/ui/browse.html.php b/module/tree/ui/browse.html.php index 1d4152fb34..4cefc49473 100644 --- a/module/tree/ui/browse.html.php +++ b/module/tree/ui/browse.html.php @@ -249,9 +249,7 @@ div set::title($manageTitle), to::headingActions ( - ($viewType == 'story' && $allProduct && $canBeChanged) ? btn(setClass('primary'), set::size('sm'), $lang->tree->syncFromProduct, on::click('toggleCopy')) : null, - ($viewType == 'feedback' && common::hasPriv('feedback', 'syncProduct') && !isset($syncConfig[$rootID])) ? btn(setClass('primary'), set::size('sm'), set::url(createLink('feedback', 'syncProduct', "productID=$rootID&module=feedback&parent=$parent")), setData('toggle', 'modal'), $lang->tree->syncProductModule) : null, - ($viewType == 'ticket' && common::hasPriv('ticket', 'syncProduct') && !isset($syncConfig[$rootID])) ? btn(setClass('primary'), set::size('sm'), set::url(createLink('ticket', 'syncProduct', "productID=$rootID&parent=$parent")), setData('toggle', 'modal'), $lang->tree->syncProductModule) : null + ($viewType == 'story' && $allProduct && $canBeChanged) ? btn(setClass('primary'), set::size('sm'), $lang->tree->syncFromProduct, on::click('toggleCopy')) : null ), div (