From c3558d6b7569b9087f3c767ed503ae3070f05449 Mon Sep 17 00:00:00 2001 From: zhouxin Date: Thu, 4 Nov 2021 13:12:17 +0800 Subject: [PATCH 1/2] Finish task #43877. --- module/tree/view/edit.html.php | 1 - 1 file changed, 1 deletion(-) diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php index a73ca853ed..1b45b20748 100644 --- a/module/tree/view/edit.html.php +++ b/module/tree/view/edit.html.php @@ -119,7 +119,6 @@ $(function() { $('#root').change(function() { - if($(this).val() == currentRoot) return true; var confirmRoot = tree->confirmRoot4Doc : $lang->tree->confirmRoot);?>; if(!confirm(confirmRoot)) { From 8fe8ad90afd0b21ae02bd6a1098bdb7f643b4c1a Mon Sep 17 00:00:00 2001 From: zhouxin Date: Thu, 4 Nov 2021 13:22:09 +0800 Subject: [PATCH 2/2] Finish task 43877. --- module/common/lang/menu.php | 2 +- module/index/js/index.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index ec7922f835..edf51e6c38 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -159,7 +159,7 @@ $lang->product->menu->plan = array('link' => "{$lang->productplan->shortComm $lang->product->menu->release = array('link' => "{$lang->release->common}|release|browse|productID=%s", 'subModule' => 'release'); $lang->product->menu->roadmap = array('link' => "{$lang->roadmap}|product|roadmap|productID=%s"); if($config->systemMode == 'new') $lang->product->menu->project = array('link' => "{$lang->project->common}|product|project|status=all&productID=%s"); -if($config->systemMode == 'classic') $lang->product->menu->project = array('link' => "{$lang->execution->common}|product|project|status=all&productID=%s"); +if($config->systemMode == 'classic') $lang->product->menu->project = array('link' => "{$lang->execution->common}|product|project|status=all&productID=%s"); $lang->product->menu->track = array('link' => "{$lang->track}|story|track|productID=%s"); $lang->product->menu->doc = array('link' => "{$lang->doc->common}|doc|tableContents|type=product&objectID=%s", 'subModule' => 'doc'); $lang->product->menu->dynamic = array('link' => "{$lang->dynamic}|product|dynamic|productID=%s"); diff --git a/module/index/js/index.js b/module/index/js/index.js index 0fb76f5ac5..af88f8f157 100644 --- a/module/index/js/index.js +++ b/module/index/js/index.js @@ -152,7 +152,8 @@ if(viewType === 'doc' && (link.params.from === 'product' || link.params.$5 == 'product')) return 'product'; if(viewType === 'doc' && (link.params.from === 'project' || link.params.$5 == 'project')) return 'project'; - if(viewType === 'doc') return 'doc'; + if(viewType === 'doc') return 'doc'; + if(viewType === 'story') return 'product'; } else if(methodLowerCase === 'browsetask') {