@@ -39,10 +39,10 @@ |
||
39 | 39 | $model->setName($menu->name); |
40 | 40 | $model->setBasepath(config('crudbooster.ADMIN_PATH').'/'.basename($model->getUrl())); |
41 | 41 | } else { |
42 | - $model->setUrl($menu->path); |
|
42 | + $model->setUrl($menu->path); |
|
43 | 43 | $model->setIcon($menu->icon); |
44 | 44 | $model->setName($menu->name); |
45 | - } |
|
45 | + } |
|
46 | 46 | |
47 | 47 | if(request()->is($model->getBasepath()."*")) { |
48 | 48 | $model->setIsActive(true); |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | private function assignToModel($menu) { |
18 | 18 | $model = new SidebarModel(); |
19 | 19 | $model->setId($menu->id); |
20 | - if($menu->type == "url") { |
|
20 | + if ($menu->type == "url") { |
|
21 | 21 | $model->setUrl($menu->path); |
22 | 22 | $model->setIcon($menu->icon); |
23 | 23 | $model->setName($menu->name); |
@@ -44,9 +44,9 @@ discard block |
||
44 | 44 | $model->setName($menu->name); |
45 | 45 | } |
46 | 46 | |
47 | - if(request()->is($model->getBasepath()."*")) { |
|
47 | + if (request()->is($model->getBasepath()."*")) { |
|
48 | 48 | $model->setIsActive(true); |
49 | - }else{ |
|
49 | + } else { |
|
50 | 50 | $model->setIsActive(false); |
51 | 51 | } |
52 | 52 | |
@@ -55,22 +55,22 @@ discard block |
||
55 | 55 | |
56 | 56 | private function loadData($parent_id = null) { |
57 | 57 | $menus = DB::table("cb_menus"); |
58 | - if($parent_id) { |
|
59 | - $menus->where("parent_cb_menus_id",$parent_id); |
|
60 | - }else{ |
|
58 | + if ($parent_id) { |
|
59 | + $menus->where("parent_cb_menus_id", $parent_id); |
|
60 | + } else { |
|
61 | 61 | $menus->whereNull("parent_cb_menus_id"); |
62 | 62 | } |
63 | - return $menus->orderBy("sort_number","asc")->get(); |
|
63 | + return $menus->orderBy("sort_number", "asc")->get(); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | private function rolePrivilege($cb_roles_id, $cb_menus_id) { |
67 | - return cb()->find("cb_role_privileges",['cb_roles_id'=>$cb_roles_id,'cb_menus_id'=>$cb_menus_id]); |
|
67 | + return cb()->find("cb_role_privileges", ['cb_roles_id'=>$cb_roles_id, 'cb_menus_id'=>$cb_menus_id]); |
|
68 | 68 | } |
69 | 69 | |
70 | - private function checkPrivilege($roles_id,$menu) { |
|
71 | - if($roles_id) { |
|
70 | + private function checkPrivilege($roles_id, $menu) { |
|
71 | + if ($roles_id) { |
|
72 | 72 | $privilege = $this->rolePrivilege($roles_id, $menu->id); |
73 | - if($privilege && !$privilege->can_browse) { |
|
73 | + if ($privilege && !$privilege->can_browse) { |
|
74 | 74 | return false; |
75 | 75 | } |
76 | 76 | } |
@@ -79,30 +79,30 @@ discard block |
||
79 | 79 | } |
80 | 80 | |
81 | 81 | public function all($withPrivilege = true) { |
82 | - $roles_id = ($withPrivilege)?cb()->session()->roleId():null; |
|
82 | + $roles_id = ($withPrivilege) ?cb()->session()->roleId() : null; |
|
83 | 83 | $idHash = "menuUser".$roles_id.auth()->id(); |
84 | - if($menu = CacheHelper::getItemInGroup($idHash,"sidebar_menu")) return $menu; |
|
84 | + if ($menu = CacheHelper::getItemInGroup($idHash, "sidebar_menu")) return $menu; |
|
85 | 85 | |
86 | 86 | $menus = $this->loadData(); |
87 | 87 | $result = []; |
88 | - foreach($menus as $menu) { |
|
88 | + foreach ($menus as $menu) { |
|
89 | 89 | |
90 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue; |
|
90 | + if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue; |
|
91 | 91 | |
92 | 92 | $sidebarModel = $this->assignToModel($menu); |
93 | - if($menus2 = $this->loadData($menu->id)) { |
|
93 | + if ($menus2 = $this->loadData($menu->id)) { |
|
94 | 94 | $sub1 = []; |
95 | 95 | foreach ($menus2 as $menu2) { |
96 | 96 | |
97 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue; |
|
97 | + if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue; |
|
98 | 98 | |
99 | 99 | $sidebarModel2 = $this->assignToModel($menu2); |
100 | 100 | |
101 | - if($menus3 = $this->loadData($menu2->id)) { |
|
101 | + if ($menus3 = $this->loadData($menu2->id)) { |
|
102 | 102 | $sub2 = []; |
103 | 103 | foreach ($menus3 as $menu3) { |
104 | 104 | |
105 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue; |
|
105 | + if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue; |
|
106 | 106 | |
107 | 107 | $sidebarModel3 = $this->assignToModel($menu3); |
108 | 108 | |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | $result[] = $sidebarModel; |
118 | 118 | } |
119 | 119 | |
120 | - CacheHelper::putInGroup($idHash, $result,"sidebar_menu", 3600); |
|
120 | + CacheHelper::putInGroup($idHash, $result, "sidebar_menu", 3600); |
|
121 | 121 | return $result; |
122 | 122 | } |
123 | 123 |
@@ -21,8 +21,8 @@ discard block |
||
21 | 21 | public function indexRender($row, $column) |
22 | 22 | { |
23 | 23 | if($column->getFormat()) { |
24 | - $datetime = date_create_from_format($column->getFormat(), $value); |
|
25 | - return $datetime ? $datetime->format('Y-m-d H:i:s') : $value; |
|
24 | + $datetime = date_create_from_format($column->getFormat(), $value); |
|
25 | + return $datetime ? $datetime->format('Y-m-d H:i:s') : $value; |
|
26 | 26 | }else{ |
27 | 27 | return $row->{$column->getField()}; |
28 | 28 | } |
@@ -30,11 +30,11 @@ discard block |
||
30 | 30 | |
31 | 31 | public function assignment($value, $column) |
32 | 32 | { |
33 | - if($column->getFormat()) { |
|
34 | - return date_create_from_format($column->getFormat(), $value)->format('Y-m-d H:i:s'); |
|
35 | - } else { |
|
36 | - return $value; |
|
37 | - } |
|
33 | + if($column->getFormat()) { |
|
34 | + return date_create_from_format($column->getFormat(), $value)->format('Y-m-d H:i:s'); |
|
35 | + } else { |
|
36 | + return $value; |
|
37 | + } |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | public function detailRender($row, $column) |
@@ -20,17 +20,17 @@ discard block |
||
20 | 20 | */ |
21 | 21 | public function indexRender($row, $column) |
22 | 22 | { |
23 | - if($column->getFormat()) { |
|
23 | + if ($column->getFormat()) { |
|
24 | 24 | $datetime = date_create_from_format($column->getFormat(), $value); |
25 | 25 | return $datetime ? $datetime->format('Y-m-d H:i:s') : $value; |
26 | - }else{ |
|
26 | + } else { |
|
27 | 27 | return $row->{$column->getField()}; |
28 | 28 | } |
29 | 29 | } |
30 | 30 | |
31 | 31 | public function assignment($value, $column) |
32 | 32 | { |
33 | - if($column->getFormat()) { |
|
33 | + if ($column->getFormat()) { |
|
34 | 34 | return date_create_from_format($column->getFormat(), $value)->format('Y-m-d H:i:s'); |
35 | 35 | } else { |
36 | 36 | return $value; |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | { |
47 | 47 | $start = sanitizeXSS($value['start']); |
48 | 48 | $end = sanitizeXSS($value['end']); |
49 | - if($start && $end) { |
|
49 | + if ($start && $end) { |
|
50 | 50 | $start = date("Y-m-d H:i:s", strtotime($start)); |
51 | 51 | $end = date("Y-m-d H:i:s", strtotime($end)); |
52 | 52 | $query->whereBetween($column->getFilterColumn(), [$start, $end]); |
@@ -23,7 +23,7 @@ |
||
23 | 23 | if($column->getFormat()) { |
24 | 24 | $datetime = date_create_from_format($column->getFormat(), $value); |
25 | 25 | return $datetime ? $datetime->format('Y-m-d H:i:s') : $value; |
26 | - }else{ |
|
26 | + } else{ |
|
27 | 27 | return $row->{$column->getField()}; |
28 | 28 | } |
29 | 29 | } |
@@ -28,12 +28,12 @@ |
||
28 | 28 | |
29 | 29 | public function assignment($value, $column) |
30 | 30 | { |
31 | - if($column->getFormat()) { |
|
32 | - $date = date_create_from_format($column->getFormat(), $value); |
|
33 | - return $date ? $date->format('Y-m-d') : $value; |
|
34 | - } else { |
|
35 | - return $value; |
|
36 | - } |
|
31 | + if($column->getFormat()) { |
|
32 | + $date = date_create_from_format($column->getFormat(), $value); |
|
33 | + return $date ? $date->format('Y-m-d') : $value; |
|
34 | + } else { |
|
35 | + return $value; |
|
36 | + } |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | public function detailRender($row, $column) |
@@ -19,16 +19,16 @@ discard block |
||
19 | 19 | */ |
20 | 20 | public function indexRender($row, $column) |
21 | 21 | { |
22 | - if($column->getFormat()) { |
|
22 | + if ($column->getFormat()) { |
|
23 | 23 | return date($column->getFormat(), strtotime($row->{$column->getField()})); |
24 | - }else{ |
|
24 | + } else { |
|
25 | 25 | return $row->{$column->getField()}; |
26 | 26 | } |
27 | 27 | } |
28 | 28 | |
29 | 29 | public function assignment($value, $column) |
30 | 30 | { |
31 | - if($column->getFormat()) { |
|
31 | + if ($column->getFormat()) { |
|
32 | 32 | $date = date_create_from_format($column->getFormat(), $value); |
33 | 33 | return $date ? $date->format('Y-m-d') : $value; |
34 | 34 | } else { |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | { |
46 | 46 | $start = sanitizeXSS($value['start']); |
47 | 47 | $end = sanitizeXSS($value['end']); |
48 | - if($start && $end) { |
|
48 | + if ($start && $end) { |
|
49 | 49 | $start = date("Y-m-d", strtotime($start)); |
50 | 50 | $end = date("Y-m-d", strtotime($end)); |
51 | 51 | $query->whereBetween($column->getFilterColumn(), [$start, $end]); |
@@ -21,7 +21,7 @@ |
||
21 | 21 | public function options($data_options) { |
22 | 22 | $data = columnSingleton()->getColumn($this->index); |
23 | 23 | |
24 | - foreach($data_options as $key=>$option) { |
|
24 | + foreach ($data_options as $key=>$option) { |
|
25 | 25 | $data_options[$key] = $option; |
26 | 26 | } |
27 | 27 |