|
@@ -150,8 +150,6 @@ class Menu
|
|
if (layadmin()) {
|
|
if (layadmin()) {
|
|
$console = true;
|
|
$console = true;
|
|
}
|
|
}
|
|
-
|
|
|
|
- $this->getGroup();
|
|
|
|
|
|
|
|
foreach ($menu as $k => $v) {
|
|
foreach ($menu as $k => $v) {
|
|
|
|
|
|
@@ -171,12 +169,10 @@ class Menu
|
|
}
|
|
}
|
|
|
|
|
|
$menu[$k] = $this->getChild($menu[$k], $child, $v, $auth);
|
|
$menu[$k] = $this->getChild($menu[$k], $child, $v, $auth);
|
|
-
|
|
|
|
if (!isset($menu[$k]['child'])) {
|
|
if (!isset($menu[$k]['child'])) {
|
|
- if (isset($this->group[$menu[$k]['group_id']])) {
|
|
|
|
- //unset($this->group[$menu[$k]['group_id']]);
|
|
|
|
- }
|
|
|
|
unset($menu[$k]);
|
|
unset($menu[$k]);
|
|
|
|
+ } else {
|
|
|
|
+ $this->group[$menu[$k]['group_id']] = $menu[$k]['group_id'];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} elseif (!$ms && $state == 2) {
|
|
} elseif (!$ms && $state == 2) {
|
|
@@ -524,7 +520,16 @@ class Menu
|
|
|
|
|
|
private function getGroup()
|
|
private function getGroup()
|
|
{
|
|
{
|
|
- if (!$this->group) {
|
|
|
|
|
|
+ if ($this->group) {
|
|
|
|
+ $group = Dever::db('manage/menu_group')->state();
|
|
|
|
+ foreach ($group as $k => $v) {
|
|
|
|
+ if (!isset($this->group[$k])) {
|
|
|
|
+ unset($group[$k]);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return $group;
|
|
|
|
+ } else {
|
|
$this->group = Dever::db('manage/menu_group')->state();
|
|
$this->group = Dever::db('manage/menu_group')->state();
|
|
}
|
|
}
|
|
|
|
|