@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | $model->setIcon($menu->icon); |
29 | 29 | $model->setName($menu->name); |
30 | 30 | $model->setBasepath(basename($model->getUrl())); |
31 | - }elseif ($menu->type == "module") { |
|
31 | + } elseif ($menu->type == "module") { |
|
32 | 32 | $module = cb()->find("cb_modules", $menu->cb_modules_id); |
33 | 33 | $className = '\App\Http\Controllers\\'.$module->controller; |
34 | 34 | $controllerClass = new $className(); |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | $model->setIcon($module->icon); |
39 | 39 | $model->setName($module->name); |
40 | 40 | $model->setBasepath(config('crudbooster.ADMIN_PATH').'/'.basename($model->getUrl())); |
41 | - }elseif ($menu->type == "path") { |
|
41 | + } elseif ($menu->type == "path") { |
|
42 | 42 | $model->setUrl(cb()->getAdminUrl($menu->path)); |
43 | 43 | $model->setPermalink($menu->path); |
44 | 44 | $model->setIcon($menu->icon); |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | |
49 | 49 | if(request()->is($model->getBasepath()."*")) { |
50 | 50 | $model->setIsActive(true); |
51 | - }else{ |
|
51 | + } else{ |
|
52 | 52 | $model->setIsActive(false); |
53 | 53 | } |
54 | 54 | |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | $menus = DB::table("cb_menus"); |
60 | 60 | if($parent_id) { |
61 | 61 | $menus->where("parent_cb_menus_id",$parent_id); |
62 | - }else{ |
|
62 | + } else{ |
|
63 | 63 | $menus->whereNull("parent_cb_menus_id"); |
64 | 64 | } |
65 | 65 | return $menus->orderBy("sort_number","asc")->get(); |
@@ -83,20 +83,26 @@ discard block |
||
83 | 83 | public function all($withPrivilege = true) { |
84 | 84 | $roles_id = ($withPrivilege)?cb()->session()->roleId():null; |
85 | 85 | $idHash = "menuUser".$roles_id.auth()->id(); |
86 | - if($menu = CacheHelper::getItemInGroup($idHash,"sidebar_menu")) return $menu; |
|
86 | + if($menu = CacheHelper::getItemInGroup($idHash,"sidebar_menu")) { |
|
87 | + return $menu; |
|
88 | + } |
|
87 | 89 | |
88 | 90 | $menus = $this->loadData(); |
89 | 91 | $result = []; |
90 | 92 | foreach($menus as $menu) { |
91 | 93 | |
92 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue; |
|
94 | + if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) { |
|
95 | + continue; |
|
96 | + } |
|
93 | 97 | |
94 | 98 | $sidebarModel = $this->assignToModel($menu); |
95 | 99 | if($menus2 = $this->loadData($menu->id)) { |
96 | 100 | $sub1 = []; |
97 | 101 | foreach ($menus2 as $menu2) { |
98 | 102 | |
99 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue; |
|
103 | + if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) { |
|
104 | + continue; |
|
105 | + } |
|
100 | 106 | |
101 | 107 | $sidebarModel2 = $this->assignToModel($menu2); |
102 | 108 | |
@@ -104,7 +110,9 @@ discard block |
||
104 | 110 | $sub2 = []; |
105 | 111 | foreach ($menus3 as $menu3) { |
106 | 112 | |
107 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue; |
|
113 | + if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) { |
|
114 | + continue; |
|
115 | + } |
|
108 | 116 | |
109 | 117 | $sidebarModel3 = $this->assignToModel($menu3); |
110 | 118 |