From f51ffc06ed1facf47ab80100ab99db20f05f42fd Mon Sep 17 00:00:00 2001 From: sunguangming Date: Thu, 28 Dec 2023 14:55:16 +0800 Subject: [PATCH] * Fix bug #41847. --- module/project/js/create.ui.js | 1 + module/project/js/edit.ui.js | 1 + module/project/ui/create.html.php | 17 ++++++++++++++--- module/project/ui/edit.html.php | 13 ++++++++++++- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/module/project/js/create.ui.js b/module/project/js/create.ui.js index 144c3d10be..3f4f6d5e41 100644 --- a/module/project/js/create.ui.js +++ b/module/project/js/create.ui.js @@ -1,6 +1,7 @@ $(function() { new zui.Tooltip('#programHover', {title: programTip, trigger: 'hover', placement: 'right', type: 'white', 'className': 'text-gray border border-light programTip'}); + new zui.Tooltip('#stageByHover', {title: stageByTip, trigger: 'hover', placement: 'right', type: 'white', 'className': 'text-gray border border-light programTip'}); setWhite(); }); diff --git a/module/project/js/edit.ui.js b/module/project/js/edit.ui.js index 4ca23bbe56..08c3eea698 100644 --- a/module/project/js/edit.ui.js +++ b/module/project/js/edit.ui.js @@ -1,6 +1,7 @@ $(function() { new zui.Tooltip('#programHover', {title: programTip, trigger: 'hover', placement: 'right', type: 'white', 'className': 'text-gray border border-light programTip'}); + new zui.Tooltip('#stageByHover', {title: stageByTip, trigger: 'hover', placement: 'right', type: 'white', 'className': 'text-gray border border-light programTip'}); setWhite(); }); diff --git a/module/project/ui/create.html.php b/module/project/ui/create.html.php index 115eb991b2..974aed652f 100644 --- a/module/project/ui/create.html.php +++ b/module/project/ui/create.html.php @@ -15,6 +15,7 @@ jsVar('ignore', $lang->project->ignore); jsVar('multiBranchProducts', $multiBranchProducts); jsVar('errorSameProducts', $lang->project->errorSameProducts); jsVar('programTip', $lang->program->tips); +jsVar('stageByTip', $lang->project->stageByTips); $projectModelItems = array(); foreach($lang->project->modelList as $key => $text) @@ -530,10 +531,20 @@ formPanel setClass('project-stageBy-product'), set::disabled($copyProjectID), $lang->project->stageByList['product'] - ) + ), + div + ( + setClass('pl-2 flex self-center'), + icon + ( + 'help', + set('data-toggle', 'tooltip'), + set('id', 'stageByHover') + ) + ), ), - formHidden('stageBy', $copyProjectID ? $copyProject->stageBy : 'project') - ) + formHidden('stageBy', $copyProjectID ? $copyProject->stageBy : 'project'), + ), ) : null, formGroup ( diff --git a/module/project/ui/edit.html.php b/module/project/ui/edit.html.php index 32c51931a9..a8bfa9c9bf 100644 --- a/module/project/ui/edit.html.php +++ b/module/project/ui/edit.html.php @@ -22,6 +22,7 @@ jsVar('unLinkProductTip', $lang->project->unLinkProductTip); jsVar('allProducts', $allProducts); jsVar('branchGroups', $branchGroups); jsVar('programTip', $lang->program->tips); +jsVar('stageByTip', $lang->project->stageByTips); jsVar('projectID', $project->id); jsVar('from', $from); @@ -499,7 +500,17 @@ formPanel setClass('project-stageBy-product'), set::disabled($disableStageBy), $lang->project->stageByList['product'] - ) + ), + div + ( + setClass('pl-2 flex self-center'), + icon + ( + 'help', + set('data-toggle', 'tooltip'), + set('id', 'stageByHover') + ) + ), ), formHidden('stageBy', $project->stageBy) )