@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | private function assignToModel($menu) { |
24 | 24 | $model = new SidebarModel(); |
25 | 25 | $model->setId($menu->id); |
26 | - if($menu->type == "url") { |
|
26 | + if ($menu->type == "url") { |
|
27 | 27 | $model->setUrl($menu->path); |
28 | 28 | $model->setIcon($menu->icon); |
29 | 29 | $model->setName($menu->name); |
@@ -46,9 +46,9 @@ discard block |
||
46 | 46 | $model->setBasepath(config('crudbooster.ADMIN_PATH').'/'.basename($model->getUrl())); |
47 | 47 | } |
48 | 48 | |
49 | - if(request()->is($model->getBasepath()."*")) { |
|
49 | + if (request()->is($model->getBasepath()."*")) { |
|
50 | 50 | $model->setIsActive(true); |
51 | - }else{ |
|
51 | + } else { |
|
52 | 52 | $model->setIsActive(false); |
53 | 53 | } |
54 | 54 | |
@@ -57,22 +57,22 @@ discard block |
||
57 | 57 | |
58 | 58 | private function loadData($parent_id = null) { |
59 | 59 | $menus = DB::table("cb_menus"); |
60 | - if($parent_id) { |
|
61 | - $menus->where("parent_cb_menus_id",$parent_id); |
|
62 | - }else{ |
|
60 | + if ($parent_id) { |
|
61 | + $menus->where("parent_cb_menus_id", $parent_id); |
|
62 | + } else { |
|
63 | 63 | $menus->whereNull("parent_cb_menus_id"); |
64 | 64 | } |
65 | - return $menus->orderBy("sort_number","asc")->get(); |
|
65 | + return $menus->orderBy("sort_number", "asc")->get(); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | private function rolePrivilege($cb_roles_id, $cb_menus_id) { |
69 | - return cb()->find("cb_role_privileges",['cb_roles_id'=>$cb_roles_id,'cb_menus_id'=>$cb_menus_id]); |
|
69 | + return cb()->find("cb_role_privileges", ['cb_roles_id'=>$cb_roles_id, 'cb_menus_id'=>$cb_menus_id]); |
|
70 | 70 | } |
71 | 71 | |
72 | - private function checkPrivilege($roles_id,$menu) { |
|
73 | - if($roles_id) { |
|
72 | + private function checkPrivilege($roles_id, $menu) { |
|
73 | + if ($roles_id) { |
|
74 | 74 | $privilege = $this->rolePrivilege($roles_id, $menu->id); |
75 | - if($privilege && !$privilege->can_browse) { |
|
75 | + if ($privilege && !$privilege->can_browse) { |
|
76 | 76 | return false; |
77 | 77 | } |
78 | 78 | } |
@@ -81,30 +81,30 @@ discard block |
||
81 | 81 | } |
82 | 82 | |
83 | 83 | public function all($withPrivilege = true) { |
84 | - $roles_id = ($withPrivilege)?cb()->session()->roleId():null; |
|
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")) return $menu; |
|
87 | 87 | |
88 | 88 | $menus = $this->loadData(); |
89 | 89 | $result = []; |
90 | - foreach($menus as $menu) { |
|
90 | + foreach ($menus as $menu) { |
|
91 | 91 | |
92 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue; |
|
92 | + if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue; |
|
93 | 93 | |
94 | 94 | $sidebarModel = $this->assignToModel($menu); |
95 | - if($menus2 = $this->loadData($menu->id)) { |
|
95 | + if ($menus2 = $this->loadData($menu->id)) { |
|
96 | 96 | $sub1 = []; |
97 | 97 | foreach ($menus2 as $menu2) { |
98 | 98 | |
99 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue; |
|
99 | + if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue; |
|
100 | 100 | |
101 | 101 | $sidebarModel2 = $this->assignToModel($menu2); |
102 | 102 | |
103 | - if($menus3 = $this->loadData($menu2->id)) { |
|
103 | + if ($menus3 = $this->loadData($menu2->id)) { |
|
104 | 104 | $sub2 = []; |
105 | 105 | foreach ($menus3 as $menu3) { |
106 | 106 | |
107 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue; |
|
107 | + if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue; |
|
108 | 108 | |
109 | 109 | $sidebarModel3 = $this->assignToModel($menu3); |
110 | 110 | |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | $result[] = $sidebarModel; |
120 | 120 | } |
121 | 121 | |
122 | - CacheHelper::putInGroup($idHash, $result,"sidebar_menu", 3600); |
|
122 | + CacheHelper::putInGroup($idHash, $result, "sidebar_menu", 3600); |
|
123 | 123 | return $result; |
124 | 124 | } |
125 | 125 |
@@ -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 |
@@ -20,9 +20,9 @@ discard block |
||
20 | 20 | */ |
21 | 21 | public function indexRender($row, $column) |
22 | 22 | { |
23 | - if($column->getFormat()) { |
|
23 | + if ($column->getFormat()) { |
|
24 | 24 | return date($column->getFormat(), strtotime($row->{$column->getField()})); |
25 | - }else{ |
|
25 | + } else { |
|
26 | 26 | return $row->{$column->getField()}; |
27 | 27 | } |
28 | 28 | } |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | { |
37 | 37 | $start = sanitizeXSS($value['start']); |
38 | 38 | $end = sanitizeXSS($value['end']); |
39 | - if($start && $end) { |
|
39 | + if ($start && $end) { |
|
40 | 40 | $start = date("H:i:s", strtotime($start)); |
41 | 41 | $end = date("H:i:s", strtotime($end)); |
42 | 42 | $query->whereBetween($column->getFilterColumn(), [$start, $end]); |
@@ -22,7 +22,7 @@ |
||
22 | 22 | { |
23 | 23 | if($column->getFormat()) { |
24 | 24 | return date($column->getFormat(), strtotime($row->{$column->getField()})); |
25 | - }else{ |
|
25 | + } else{ |
|
26 | 26 | return $row->{$column->getField()}; |
27 | 27 | } |
28 | 28 | } |
@@ -18,7 +18,7 @@ |
||
18 | 18 | { |
19 | 19 | $start = sanitizeXSS($value['start']); |
20 | 20 | $end = sanitizeXSS($value['end']); |
21 | - if($start && $end) { |
|
21 | + if ($start && $end) { |
|
22 | 22 | $query->whereBetween($column->getFilterColumn(), [$start, $end]); |
23 | 23 | } |
24 | 24 | return $query; |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | public function indexRender($row, $column) |
23 | 23 | { |
24 | 24 | $value = trim(strip_tags($row->{ $column->getField() })); |
25 | - if($column->getLimit()) { |
|
25 | + if ($column->getLimit()) { |
|
26 | 26 | $value = Str::limit($value, $column->getLimit()); |
27 | 27 | } |
28 | 28 | return $value; |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | |
32 | 32 | public function filterQuery($query, $column, $value) |
33 | 33 | { |
34 | - $query->where($column->getFilterColumn(),"like","%".$value."%"); |
|
34 | + $query->where($column->getFilterColumn(), "like", "%".$value."%"); |
|
35 | 35 | return $query; |
36 | 36 | } |
37 | 37 |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | /** @var \crocodicstudio\crudbooster\types\text\TextModel $column */ |
3 | - $filterName = "filter_".slug($column->getFilterColumn(),"_"); |
|
3 | + $filterName = "filter_".slug($column->getFilterColumn(), "_"); |
|
4 | 4 | $filterValue = sanitizeXSS(request($filterName)); |
5 | 5 | ?> |
6 | 6 | <select name="filter_{{ slug($column->getFilterColumn(),"_") }}" style="width: 100%" id="filter_{{ $column->getName() }}" class="form-control select2"> |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | /** @var \crocodicstudio\crudbooster\types\checkbox\CheckboxModel $column */ |
3 | - $filterName = "filter_".slug($column->getFilterColumn(),"_"); |
|
3 | + $filterName = "filter_".slug($column->getFilterColumn(), "_"); |
|
4 | 4 | $filterValue = sanitizeXSS(request($filterName)); |
5 | 5 | ?> |
6 | 6 | <select name="filter_{{ slug($column->getFilterColumn(),"_") }}" style="width: 100%" id="filter_{{ $column->getName() }}" class="form-control select2"> |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | /** @var \crocodicstudio\crudbooster\types\radio\RadioModel $column */ |
3 | - $filterName = "filter_".slug($column->getFilterColumn(),"_"); |
|
3 | + $filterName = "filter_".slug($column->getFilterColumn(), "_"); |
|
4 | 4 | $filterValue = sanitizeXSS(request($filterName)); |
5 | 5 | ?> |
6 | 6 | <select name="filter_{{ slug($column->getFilterColumn(),"_") }}" style="width: 100%" id="filter_{{ $column->getName() }}" class="form-control select2"> |
@@ -21,23 +21,23 @@ |
||
21 | 21 | */ |
22 | 22 | public function assignment($value, $column) |
23 | 23 | { |
24 | - $value = str_replace($column->getThousands()?:",","", $value); |
|
25 | - $value = str_replace($column->getDecimal()?:".",".",$value); |
|
24 | + $value = str_replace($column->getThousands() ?: ",", "", $value); |
|
25 | + $value = str_replace($column->getDecimal() ?: ".", ".", $value); |
|
26 | 26 | return $value; |
27 | 27 | } |
28 | 28 | |
29 | 29 | public function indexRender($row, $column) |
30 | 30 | { |
31 | 31 | $value = $row->{$column->getField()}; |
32 | - $prefix = ($column->getPrefix())?:""; |
|
33 | - return $prefix.number_format($value, $column->getPrecision()?:0, $column->getDecimal()?:".", $column->getThousands()?:","); |
|
32 | + $prefix = ($column->getPrefix()) ?: ""; |
|
33 | + return $prefix.number_format($value, $column->getPrecision() ?: 0, $column->getDecimal() ?: ".", $column->getThousands() ?: ","); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | public function filterQuery($query, $column, $value) |
37 | 37 | { |
38 | 38 | $start = sanitizeXSS($value['start']); |
39 | 39 | $end = sanitizeXSS($value['end']); |
40 | - if($start && $end) { |
|
40 | + if ($start && $end) { |
|
41 | 41 | $query->whereBetween($column->getFilterColumn(), [$start, $end]); |
42 | 42 | } |
43 | 43 | return $query; |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public function optionsFromTable($table, $value_option, $display_option, $sql_condition = null) { |
44 | 44 | |
45 | - if(strpos($table,"App\Models")!==false) { |
|
45 | + if (strpos($table, "App\Models") !== false) { |
|
46 | 46 | $table = new $table(); |
47 | 47 | $table = $table::$tableName; |
48 | 48 | } |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | |
54 | 54 | $options = []; |
55 | 55 | foreach ($data as $d) { |
56 | - $options[ $d->$value_option ] = $d->$display_option; |
|
56 | + $options[$d->$value_option] = $d->$display_option; |
|
57 | 57 | } |
58 | 58 | $data = columnSingleton()->getColumn($this->index); |
59 | 59 | /** @var $data SelectTableModel */ |