From 9129431f10f2a14b20cc4c01a4a300a112eac66d Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 14 Mar 2024 13:47:22 +0800 Subject: [PATCH] * Fix bug #46985, hidden longTime checkbox in no-execution project. --- module/project/ui/common.field.php | 1 - module/project/ui/create.field.php | 1 + module/project/ui/edit.field.php | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/module/project/ui/common.field.php b/module/project/ui/common.field.php index ad0953e9f6..b45889f903 100644 --- a/module/project/ui/common.field.php +++ b/module/project/ui/common.field.php @@ -48,7 +48,6 @@ unset($lang->project->endList[999]); $isLongTime = data('project.end') == LONG_TIME; $fields->field('begin') ->label($lang->project->planDate) - ->checkbox(array('text' => $lang->project->longTime, 'name' => 'longTime', 'checked' => $isLongTime)) ->required() ->controlBegin('dateRangePicker') ->beginName('begin') diff --git a/module/project/ui/create.field.php b/module/project/ui/create.field.php index 4a4a4ec061..1e8ff9213f 100644 --- a/module/project/ui/create.field.php +++ b/module/project/ui/create.field.php @@ -37,6 +37,7 @@ if($hasCode) $fields->field('begin') ->tip($copyProject ? $lang->project->copyProject->endTips : null) ->tipClass('text-warning'); +if(!$copyProject || data('copyProject.multiple') != '0') $fields->field('begin')->checkbox(array('text' => $lang->project->longTime, 'name' => 'longTime', 'checked' => false)); $fields->field('days') ->control('input', array('className' => $copyProject ? 'has-warning' : '')) diff --git a/module/project/ui/edit.field.php b/module/project/ui/edit.field.php index 0ec275431c..4a3d90a39b 100644 --- a/module/project/ui/edit.field.php +++ b/module/project/ui/edit.field.php @@ -14,6 +14,8 @@ if(in_array($model, array('scrum', 'kanban'))) $fields->field('name')->checkbox( $fields->field('hasProduct')->disabled(true); +if(data('project.multiple') != '0') $fields->field('begin')->checkbox(array('text' => $lang->project->longTime, 'name' => 'longTime', 'checked' => data('project.end') == LONG_TIME)); + $budgetFuture = data('project.budget') !== null && !data('project.budget'); if(strpos($config->project->edit->requiredFields, 'budget') === false) $fields->field('budget')->checkbox(array('text' => $lang->project->future, 'name' => 'future', 'checked' => $budgetFuture)); $fields->field('budget')->value(data('project.budget') !== null && data('project.budget') == 0 ? '' : data('project.budget'));