From 73bfcd15be3c689a5b601f9c796ceae805e72789 Mon Sep 17 00:00:00 2001 From: sunguangming Date: Thu, 12 Sep 2024 04:48:18 +0000 Subject: [PATCH] * [bug#55255,done,0.2h] fix bug. --- module/common/lang/menu.php | 3 +++ module/common/model.php | 2 +- module/program/ui/create.field.php | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index f08683bb11..bd897c6809 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -408,6 +408,9 @@ $lang->execution->menu->view['subMenu'] = new stdclass(); $lang->execution->menu->view['subMenu']->groupTask = "$lang->groupView|execution|grouptask|executionID=%s"; $lang->execution->menu->view['subMenu']->tree = "$lang->treeView|execution|tree|executionID=%s"; +$lang->execution->menu->view['menuOrder'][10] = 'groupTask'; +$lang->execution->menu->view['menuOrder'][15] = 'tree'; + $lang->execution->menu->qa['subMenu'] = new stdclass(); //$lang->execution->menu->qa['subMenu']->qa = array('link' => "$lang->dashboard|execution|qa|executionID=%s"); $lang->execution->menu->qa['subMenu']->bug = array('link' => "{$lang->bug->common}|execution|bug|executionID=%s", 'subModule' => 'bug'); diff --git a/module/common/model.php b/module/common/model.php index 2062493f1d..58c5c2ab82 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -3245,7 +3245,7 @@ eof; { if(isset($menuItem->hidden) and $menuItem->hidden and (!isset($menuItem->tutorial) or !$menuItem->tutorial)) continue; if(empty($menuItem->link)) continue; - if($menuItem->divider) $menuHtml .= "
  • "; + if($menuItem->divider && $menuItem->link['method'] != 'more') $menuHtml .= "
  • "; /* Init the these vars. */ $alias = isset($menuItem->alias) ? $menuItem->alias : ''; diff --git a/module/program/ui/create.field.php b/module/program/ui/create.field.php index 69e4df980b..32954e1687 100644 --- a/module/program/ui/create.field.php +++ b/module/program/ui/create.field.php @@ -4,6 +4,8 @@ global $lang, $config; $fields = defineFieldList('program.create', 'program'); +$fields->field('parent')->disabled(false); + $fields->field('acl') ->items(data('parentProgram') ? $lang->program->subAclList : $lang->program->aclList) ->value('open');