@@ -26,16 +26,16 @@ discard block |
||
26 | 26 | try { |
27 | 27 | $routeArray = request()->route()->getAction(); |
28 | 28 | $this->controller = class_basename($routeArray['controller']); |
29 | - $this->controller = strtok($this->controller,"@"); |
|
29 | + $this->controller = strtok($this->controller, "@"); |
|
30 | 30 | |
31 | 31 | $className = "\\".$routeArray["namespace"]."\\".$this->controller; |
32 | - if(class_exists($className)) { |
|
33 | - $this->module = cb()->find("cb_modules",["controller"=>$this->controller]); |
|
34 | - if($this->module) { |
|
32 | + if (class_exists($className)) { |
|
33 | + $this->module = cb()->find("cb_modules", ["controller"=>$this->controller]); |
|
34 | + if ($this->module) { |
|
35 | 35 | $this->controller_class = new $className(); |
36 | - $this->menu = cb()->find("cb_menus",["cb_modules_id"=>$this->module->id]); |
|
37 | - $this->menu = (!$this->menu)?cb()->find("cb_menus",["type"=>"path","path"=>request()->segment(2)]):$this->menu; |
|
38 | - if($this->menu) { |
|
36 | + $this->menu = cb()->find("cb_menus", ["cb_modules_id"=>$this->module->id]); |
|
37 | + $this->menu = (!$this->menu) ?cb()->find("cb_menus", ["type"=>"path", "path"=>request()->segment(2)]) : $this->menu; |
|
38 | + if ($this->menu) { |
|
39 | 39 | $this->privilege = DB::table("cb_role_privileges") |
40 | 40 | ->where("cb_menus_id", $this->menu->id) |
41 | 41 | ->where("cb_roles_id", cb()->session()->roleId()) |
@@ -57,9 +57,9 @@ discard block |
||
57 | 57 | } |
58 | 58 | |
59 | 59 | public function getData($key) { |
60 | - if($this->controller_class) { |
|
60 | + if ($this->controller_class) { |
|
61 | 61 | $value = $this->controller_class->getData($key); |
62 | - if(isset($value)) { |
|
62 | + if (isset($value)) { |
|
63 | 63 | return $value; |
64 | 64 | } |
65 | 65 | } |
@@ -70,128 +70,128 @@ discard block |
||
70 | 70 | * @return CBController |
71 | 71 | */ |
72 | 72 | public function getController() { |
73 | - return ($this->controller_class)?$this->controller_class:null; |
|
73 | + return ($this->controller_class) ? $this->controller_class : null; |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | public function getPageTitle() |
77 | 77 | { |
78 | - return ($this->controller_class)?$this->controller_class->getData("page_title")?:cb()->getAppName():null; |
|
78 | + return ($this->controller_class) ? $this->controller_class->getData("page_title") ?: cb()->getAppName() : null; |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | public function getTable() |
82 | 82 | { |
83 | - return ($this->controller_class)?$this->controller_class->getData("table"):null; |
|
83 | + return ($this->controller_class) ? $this->controller_class->getData("table") : null; |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | public function getPageIcon() |
87 | 87 | { |
88 | - return ($this->controller_class)?$this->controller_class->getData('page_icon')?:"fa fa-bars":null; |
|
88 | + return ($this->controller_class) ? $this->controller_class->getData('page_icon') ?: "fa fa-bars" : null; |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | public function canBrowse() { |
92 | - if($this->privilege) { |
|
93 | - if($this->privilege->can_browse) return true; |
|
92 | + if ($this->privilege) { |
|
93 | + if ($this->privilege->can_browse) return true; |
|
94 | 94 | else return false; |
95 | - }else{ |
|
95 | + } else { |
|
96 | 96 | return true; |
97 | 97 | } |
98 | 98 | } |
99 | 99 | |
100 | 100 | public function canCreate() { |
101 | - if($this->privilege) { |
|
102 | - if($this->privilege->can_create) return true; |
|
101 | + if ($this->privilege) { |
|
102 | + if ($this->privilege->can_create) return true; |
|
103 | 103 | else return false; |
104 | - }else{ |
|
104 | + } else { |
|
105 | 105 | return true; |
106 | 106 | } |
107 | 107 | } |
108 | 108 | |
109 | 109 | public function canRead() { |
110 | - if($this->privilege) { |
|
111 | - if($this->privilege->can_read) return true; |
|
110 | + if ($this->privilege) { |
|
111 | + if ($this->privilege->can_read) return true; |
|
112 | 112 | else return false; |
113 | - }else{ |
|
113 | + } else { |
|
114 | 114 | return true; |
115 | 115 | } |
116 | 116 | } |
117 | 117 | |
118 | 118 | public function canUpdate() { |
119 | - if($this->privilege) { |
|
120 | - if($this->privilege->can_update) return true; |
|
119 | + if ($this->privilege) { |
|
120 | + if ($this->privilege->can_update) return true; |
|
121 | 121 | else return false; |
122 | - }else{ |
|
122 | + } else { |
|
123 | 123 | return true; |
124 | 124 | } |
125 | 125 | } |
126 | 126 | |
127 | 127 | public function canDelete() { |
128 | - if($this->privilege) { |
|
129 | - if($this->privilege->can_delete) return true; |
|
128 | + if ($this->privilege) { |
|
129 | + if ($this->privilege->can_delete) return true; |
|
130 | 130 | else return false; |
131 | - }else{ |
|
131 | + } else { |
|
132 | 132 | return true; |
133 | 133 | } |
134 | 134 | } |
135 | 135 | |
136 | 136 | public function addURL() |
137 | 137 | { |
138 | - if($this->controller_class && method_exists($this->controller_class, 'getAdd')) { |
|
138 | + if ($this->controller_class && method_exists($this->controller_class, 'getAdd')) { |
|
139 | 139 | return action($this->controller.'@getAdd'); |
140 | - }else{ |
|
140 | + } else { |
|
141 | 141 | return null; |
142 | 142 | } |
143 | 143 | } |
144 | 144 | |
145 | 145 | public function addSaveURL() |
146 | 146 | { |
147 | - if($this->controller_class && method_exists($this->controller_class, 'postAddSave')) { |
|
147 | + if ($this->controller_class && method_exists($this->controller_class, 'postAddSave')) { |
|
148 | 148 | return action($this->controller.'@postAddSave'); |
149 | - }else{ |
|
149 | + } else { |
|
150 | 150 | return null; |
151 | 151 | } |
152 | 152 | } |
153 | 153 | |
154 | 154 | public function editURL($id = null) |
155 | 155 | { |
156 | - if($this->controller_class && method_exists($this->controller_class, 'getEdit')) { |
|
157 | - return action($this->controller.'@getEdit',['id'=>$id]); |
|
158 | - }else{ |
|
156 | + if ($this->controller_class && method_exists($this->controller_class, 'getEdit')) { |
|
157 | + return action($this->controller.'@getEdit', ['id'=>$id]); |
|
158 | + } else { |
|
159 | 159 | return null; |
160 | 160 | } |
161 | 161 | } |
162 | 162 | |
163 | 163 | public function editSaveURL($id = null) |
164 | 164 | { |
165 | - if(method_exists($this->controller_class, 'postEditSave')) { |
|
166 | - return action($this->controller.'@postEditSave',['id'=>$id]); |
|
167 | - }else{ |
|
165 | + if (method_exists($this->controller_class, 'postEditSave')) { |
|
166 | + return action($this->controller.'@postEditSave', ['id'=>$id]); |
|
167 | + } else { |
|
168 | 168 | return null; |
169 | 169 | } |
170 | 170 | } |
171 | 171 | |
172 | - public function detailURL($id=null) |
|
172 | + public function detailURL($id = null) |
|
173 | 173 | { |
174 | - if($this->controller_class && method_exists($this->controller_class, 'getDetail')) { |
|
175 | - return action($this->controller.'@getDetail',['id'=>$id]); |
|
176 | - }else{ |
|
174 | + if ($this->controller_class && method_exists($this->controller_class, 'getDetail')) { |
|
175 | + return action($this->controller.'@getDetail', ['id'=>$id]); |
|
176 | + } else { |
|
177 | 177 | return null; |
178 | 178 | } |
179 | 179 | } |
180 | 180 | |
181 | - public function deleteURL($id=null) |
|
181 | + public function deleteURL($id = null) |
|
182 | 182 | { |
183 | - if($this->controller_class && method_exists($this->controller_class, 'getDelete')) { |
|
184 | - return action($this->controller.'@getDelete',['id'=>$id]); |
|
185 | - }else{ |
|
183 | + if ($this->controller_class && method_exists($this->controller_class, 'getDelete')) { |
|
184 | + return action($this->controller.'@getDelete', ['id'=>$id]); |
|
185 | + } else { |
|
186 | 186 | return null; |
187 | 187 | } |
188 | 188 | } |
189 | 189 | |
190 | 190 | public function url($path = null) |
191 | 191 | { |
192 | - if($this->controller_class && method_exists($this->controller_class, 'getIndex')) { |
|
193 | - return trim(action($this->controller.'@getIndex').'/'.$path,'/'); |
|
194 | - }else{ |
|
192 | + if ($this->controller_class && method_exists($this->controller_class, 'getIndex')) { |
|
193 | + return trim(action($this->controller.'@getIndex').'/'.$path, '/'); |
|
194 | + } else { |
|
195 | 195 | return null; |
196 | 196 | } |
197 | 197 | } |
@@ -25,12 +25,12 @@ discard block |
||
25 | 25 | public function getIndex() { |
26 | 26 | $data = []; |
27 | 27 | $data['result'] = DB::table("cb_roles")->get(); |
28 | - return view($this->view.".index",$data); |
|
28 | + return view($this->view.".index", $data); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | public function getAdd() { |
32 | 32 | $data = []; |
33 | - $data['menus'] = DB::table("cb_menus")->orderBy("name","asc")->get(); |
|
33 | + $data['menus'] = DB::table("cb_menus")->orderBy("name", "asc")->get(); |
|
34 | 34 | return view($this->view.".add", $data); |
35 | 35 | } |
36 | 36 | |
@@ -49,17 +49,17 @@ discard block |
||
49 | 49 | $privilege = []; |
50 | 50 | $privilege["cb_roles_id"] = $roles_id; |
51 | 51 | $privilege["cb_menus_id"] = $menus_id; |
52 | - $privilege["can_browse"] = @$access['can_browse']?:0; |
|
53 | - $privilege["can_create"] = @$access['can_create']?:0; |
|
54 | - $privilege["can_read"] = @$access['can_read']?:0; |
|
55 | - $privilege["can_update"] = @$access['can_update']?:0; |
|
56 | - $privilege["can_delete"] = @$access['can_delete']?:0; |
|
52 | + $privilege["can_browse"] = @$access['can_browse'] ?: 0; |
|
53 | + $privilege["can_create"] = @$access['can_create'] ?: 0; |
|
54 | + $privilege["can_read"] = @$access['can_read'] ?: 0; |
|
55 | + $privilege["can_update"] = @$access['can_update'] ?: 0; |
|
56 | + $privilege["can_delete"] = @$access['can_delete'] ?: 0; |
|
57 | 57 | DB::table("cb_role_privileges")->insert($privilege); |
58 | 58 | } |
59 | 59 | |
60 | 60 | DB::commit(); |
61 | 61 | |
62 | - return cb()->redirect(route("DeveloperRolesControllerGetIndex"),"The role has been saved!","success"); |
|
62 | + return cb()->redirect(route("DeveloperRolesControllerGetIndex"), "The role has been saved!", "success"); |
|
63 | 63 | |
64 | 64 | } catch (CBValidationException $e) { |
65 | 65 | return cb()->redirectBack($e->getMessage()); |
@@ -74,21 +74,21 @@ discard block |
||
74 | 74 | $data['row'] = cb()->find("cb_roles", $id); |
75 | 75 | |
76 | 76 | $menus = DB::table("cb_menus") |
77 | - ->leftjoin("cb_role_privileges",function($join) use ($id) { |
|
78 | - $join->on("cb_role_privileges.cb_menus_id","=","cb_menus.id")->where("cb_role_privileges.cb_roles_id", $id); |
|
77 | + ->leftjoin("cb_role_privileges", function($join) use ($id) { |
|
78 | + $join->on("cb_role_privileges.cb_menus_id", "=", "cb_menus.id")->where("cb_role_privileges.cb_roles_id", $id); |
|
79 | 79 | }) |
80 | - ->orderBy("cb_menus.name","asc") |
|
81 | - ->select("cb_menus.*","can_browse","can_create","can_read","can_update","can_delete") |
|
80 | + ->orderBy("cb_menus.name", "asc") |
|
81 | + ->select("cb_menus.*", "can_browse", "can_create", "can_read", "can_update", "can_delete") |
|
82 | 82 | ->get(); |
83 | 83 | $data['menus'] = $menus; |
84 | 84 | |
85 | - return view($this->view.".edit",$data); |
|
85 | + return view($this->view.".edit", $data); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | private function existsPrivilege($cb_roles_id, $cb_menus_id) { |
89 | - if($row = cb()->find("cb_role_privileges",['cb_roles_id'=>$cb_roles_id,'cb_menus_id'=>$cb_menus_id])) { |
|
89 | + if ($row = cb()->find("cb_role_privileges", ['cb_roles_id'=>$cb_roles_id, 'cb_menus_id'=>$cb_menus_id])) { |
|
90 | 90 | return $row->id; |
91 | - }else{ |
|
91 | + } else { |
|
92 | 92 | return null; |
93 | 93 | } |
94 | 94 | } |
@@ -97,26 +97,26 @@ discard block |
||
97 | 97 | try { |
98 | 98 | cb()->validation(['name', 'menus']); |
99 | 99 | |
100 | - cb()->updateCompact("cb_roles",$id,['name']); |
|
100 | + cb()->updateCompact("cb_roles", $id, ['name']); |
|
101 | 101 | |
102 | 102 | foreach (request("menus") as $menus_id) { |
103 | 103 | @$access = request("access")[$menus_id]; |
104 | 104 | $privilege = []; |
105 | 105 | $privilege["cb_roles_id"] = $id; |
106 | 106 | $privilege["cb_menus_id"] = $menus_id; |
107 | - $privilege["can_browse"] = @$access['can_browse']?:0; |
|
108 | - $privilege["can_create"] = @$access['can_create']?:0; |
|
109 | - $privilege["can_read"] = @$access['can_read']?:0; |
|
110 | - $privilege["can_update"] = @$access['can_update']?:0; |
|
111 | - $privilege["can_delete"] = @$access['can_delete']?:0; |
|
112 | - if($privilege_id = $this->existsPrivilege($id, $menus_id)) { |
|
107 | + $privilege["can_browse"] = @$access['can_browse'] ?: 0; |
|
108 | + $privilege["can_create"] = @$access['can_create'] ?: 0; |
|
109 | + $privilege["can_read"] = @$access['can_read'] ?: 0; |
|
110 | + $privilege["can_update"] = @$access['can_update'] ?: 0; |
|
111 | + $privilege["can_delete"] = @$access['can_delete'] ?: 0; |
|
112 | + if ($privilege_id = $this->existsPrivilege($id, $menus_id)) { |
|
113 | 113 | DB::table("cb_role_privileges")->where("id", $privilege_id)->update($privilege); |
114 | - }else{ |
|
114 | + } else { |
|
115 | 115 | DB::table("cb_role_privileges")->insert($privilege); |
116 | 116 | } |
117 | 117 | } |
118 | 118 | |
119 | - return cb()->redirect(route("DeveloperRolesControllerGetIndex"),"The role has been saved!","success"); |
|
119 | + return cb()->redirect(route("DeveloperRolesControllerGetIndex"), "The role has been saved!", "success"); |
|
120 | 120 | |
121 | 121 | } catch (CBValidationException $e) { |
122 | 122 | |
@@ -126,9 +126,9 @@ discard block |
||
126 | 126 | |
127 | 127 | public function getDelete($id) { |
128 | 128 | DB::table("cb_roles")->where("id", $id)->delete(); |
129 | - DB::table("cb_role_privileges")->where("cb_roles_id",$id)->delete(); |
|
129 | + DB::table("cb_role_privileges")->where("cb_roles_id", $id)->delete(); |
|
130 | 130 | |
131 | - return cb()->redirect(route("DeveloperRolesControllerGetIndex"), "The role has been deleted!","success"); |
|
131 | + return cb()->redirect(route("DeveloperRolesControllerGetIndex"), "The role has been deleted!", "success"); |
|
132 | 132 | } |
133 | 133 | |
134 | 134 | } |
135 | 135 | \ No newline at end of file |
@@ -59,8 +59,8 @@ discard block |
||
59 | 59 | $data = new TextModel(); |
60 | 60 | $data = $this->setDefaultModelValue($data); |
61 | 61 | $data->setLabel($label); |
62 | - $data->setName($this->name($label,$name)); |
|
63 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
62 | + $data->setName($this->name($label, $name)); |
|
63 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
64 | 64 | $data->setType("text"); |
65 | 65 | |
66 | 66 | columnSingleton()->setColumn($this->index, $data); |
@@ -75,8 +75,8 @@ discard block |
||
75 | 75 | $data = new CheckboxModel(); |
76 | 76 | $data = $this->setDefaultModelValue($data); |
77 | 77 | $data->setLabel($label); |
78 | - $data->setName($this->name($label,$name)); |
|
79 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
78 | + $data->setName($this->name($label, $name)); |
|
79 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
80 | 80 | $data->setType("checkbox"); |
81 | 81 | |
82 | 82 | columnSingleton()->setColumn($this->index, $data); |
@@ -91,8 +91,8 @@ discard block |
||
91 | 91 | $data = new PasswordModel(); |
92 | 92 | $data = $this->setDefaultModelValue($data); |
93 | 93 | $data->setLabel($label); |
94 | - $data->setName($this->name($label,$name)); |
|
95 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
94 | + $data->setName($this->name($label, $name)); |
|
95 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
96 | 96 | $data->setType("password"); |
97 | 97 | $data->setShowDetail(false); |
98 | 98 | $data->setShowIndex(false); |
@@ -109,8 +109,8 @@ discard block |
||
109 | 109 | $data = new ImageModel(); |
110 | 110 | $data = $this->setDefaultModelValue($data); |
111 | 111 | $data->setLabel($label); |
112 | - $data->setName($this->name($label,$name)); |
|
113 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
112 | + $data->setName($this->name($label, $name)); |
|
113 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
114 | 114 | $data->setType("image"); |
115 | 115 | |
116 | 116 | columnSingleton()->setColumn($this->index, $data); |
@@ -125,8 +125,8 @@ discard block |
||
125 | 125 | $data = new TextAreaModel(); |
126 | 126 | $data = $this->setDefaultModelValue($data); |
127 | 127 | $data->setLabel($label); |
128 | - $data->setName($this->name($label,$name)); |
|
129 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
128 | + $data->setName($this->name($label, $name)); |
|
129 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
130 | 130 | $data->setType("text_area"); |
131 | 131 | |
132 | 132 | columnSingleton()->setColumn($this->index, $data); |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | $data = new SelectTableModel(); |
142 | 142 | $data = $this->setDefaultModelValue($data); |
143 | 143 | $data->setLabel($label); |
144 | - $data->setName($this->name($label,$name)); |
|
144 | + $data->setName($this->name($label, $name)); |
|
145 | 145 | $data->setField($this->name($label, $name)); |
146 | 146 | $data->setType("select_table"); |
147 | 147 | |
@@ -149,8 +149,8 @@ discard block |
||
149 | 149 | |
150 | 150 | $selectTable = new SelectTable($this->index); |
151 | 151 | |
152 | - if($selectConfig) { |
|
153 | - $selectTable->optionsFromTable($selectConfig['table'],$selectConfig['value_option'],$selectConfig['display_option'],@$selectConfig['sql_condition']); |
|
152 | + if ($selectConfig) { |
|
153 | + $selectTable->optionsFromTable($selectConfig['table'], $selectConfig['value_option'], $selectConfig['display_option'], @$selectConfig['sql_condition']); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | return $selectTable; |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | $data = new SelectOptionModel(); |
164 | 164 | $data = $this->setDefaultModelValue($data); |
165 | 165 | $data->setLabel($label); |
166 | - $data->setName($this->name($label,$name)); |
|
166 | + $data->setName($this->name($label, $name)); |
|
167 | 167 | $data->setField($this->name($label, $name)); |
168 | 168 | $data->setType("select_option"); |
169 | 169 | |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | |
172 | 172 | $selectOption = new SelectOption($this->index); |
173 | 173 | |
174 | - if($options) { |
|
174 | + if ($options) { |
|
175 | 175 | $selectOption->options($options); |
176 | 176 | } |
177 | 177 | |
@@ -191,15 +191,15 @@ discard block |
||
191 | 191 | $data = new SelectQueryModel(); |
192 | 192 | $data = $this->setDefaultModelValue($data); |
193 | 193 | $data->setLabel($label); |
194 | - $data->setName($this->name($label,$name)); |
|
194 | + $data->setName($this->name($label, $name)); |
|
195 | 195 | $data->setField($this->name($label, $name)); |
196 | 196 | $data->setType("select_query"); |
197 | 197 | |
198 | 198 | columnSingleton()->setColumn($this->index, $data); |
199 | 199 | |
200 | - $selectQuery =new SelectQuery($this->index); |
|
200 | + $selectQuery = new SelectQuery($this->index); |
|
201 | 201 | |
202 | - if($query) { |
|
202 | + if ($query) { |
|
203 | 203 | $selectQuery->optionsFromQuery($query); |
204 | 204 | } |
205 | 205 | |
@@ -214,8 +214,8 @@ discard block |
||
214 | 214 | $data = new CustomModel(); |
215 | 215 | $data = $this->setDefaultModelValue($data); |
216 | 216 | $data->setLabel($label); |
217 | - $data->setName($this->name($label,$name)); |
|
218 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
217 | + $data->setName($this->name($label, $name)); |
|
218 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
219 | 219 | $data->setType("custom"); |
220 | 220 | |
221 | 221 | columnSingleton()->setColumn($this->index, $data); |
@@ -230,8 +230,8 @@ discard block |
||
230 | 230 | $data = new DateModel(); |
231 | 231 | $data = $this->setDefaultModelValue($data); |
232 | 232 | $data->setLabel($label); |
233 | - $data->setName($this->name($label,$name)); |
|
234 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
233 | + $data->setName($this->name($label, $name)); |
|
234 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
235 | 235 | $data->setType("date"); |
236 | 236 | |
237 | 237 | columnSingleton()->setColumn($this->index, $data); |
@@ -246,8 +246,8 @@ discard block |
||
246 | 246 | $data = new DatetimeModel(); |
247 | 247 | $data = $this->setDefaultModelValue($data); |
248 | 248 | $data->setLabel($label); |
249 | - $data->setName($this->name($label,$name)); |
|
250 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
249 | + $data->setName($this->name($label, $name)); |
|
250 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
251 | 251 | $data->setType("datetime"); |
252 | 252 | |
253 | 253 | columnSingleton()->setColumn($this->index, $data); |
@@ -262,8 +262,8 @@ discard block |
||
262 | 262 | $data = new EmailModel(); |
263 | 263 | $data = $this->setDefaultModelValue($data); |
264 | 264 | $data->setLabel($label); |
265 | - $data->setName($this->name($label,$name)); |
|
266 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
265 | + $data->setName($this->name($label, $name)); |
|
266 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
267 | 267 | $data->setType("email"); |
268 | 268 | |
269 | 269 | columnSingleton()->setColumn($this->index, $data); |
@@ -278,8 +278,8 @@ discard block |
||
278 | 278 | $data = new FileModel(); |
279 | 279 | $data = $this->setDefaultModelValue($data); |
280 | 280 | $data->setLabel($label); |
281 | - $data->setName($this->name($label,$name)); |
|
282 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
281 | + $data->setName($this->name($label, $name)); |
|
282 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
283 | 283 | $data->setType("file"); |
284 | 284 | |
285 | 285 | columnSingleton()->setColumn($this->index, $data); |
@@ -295,8 +295,8 @@ discard block |
||
295 | 295 | $data = new HiddenModel(); |
296 | 296 | $data = $this->setDefaultModelValue($data); |
297 | 297 | $data->setLabel($label); |
298 | - $data->setName($this->name($label,$name)); |
|
299 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
298 | + $data->setName($this->name($label, $name)); |
|
299 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
300 | 300 | $data->setType("hidden"); |
301 | 301 | |
302 | 302 | columnSingleton()->setColumn($this->index, $data); |
@@ -311,8 +311,8 @@ discard block |
||
311 | 311 | $data = new NumberModel(); |
312 | 312 | $data = $this->setDefaultModelValue($data); |
313 | 313 | $data->setLabel($label); |
314 | - $data->setName($this->name($label,$name)); |
|
315 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
314 | + $data->setName($this->name($label, $name)); |
|
315 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
316 | 316 | $data->setType("number"); |
317 | 317 | |
318 | 318 | columnSingleton()->setColumn($this->index, $data); |
@@ -327,8 +327,8 @@ discard block |
||
327 | 327 | $data = new MoneyModel(); |
328 | 328 | $data = $this->setDefaultModelValue($data); |
329 | 329 | $data->setLabel($label); |
330 | - $data->setName($this->name($label,$name)); |
|
331 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
330 | + $data->setName($this->name($label, $name)); |
|
331 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
332 | 332 | $data->setType("money"); |
333 | 333 | |
334 | 334 | columnSingleton()->setColumn($this->index, $data); |
@@ -343,8 +343,8 @@ discard block |
||
343 | 343 | $data = new RadioModel(); |
344 | 344 | $data = $this->setDefaultModelValue($data); |
345 | 345 | $data->setLabel($label); |
346 | - $data->setName($this->name($label,$name)); |
|
347 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
346 | + $data->setName($this->name($label, $name)); |
|
347 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
348 | 348 | $data->setType("radio"); |
349 | 349 | |
350 | 350 | columnSingleton()->setColumn($this->index, $data); |
@@ -359,8 +359,8 @@ discard block |
||
359 | 359 | $data = new WysiwygModel(); |
360 | 360 | $data = $this->setDefaultModelValue($data); |
361 | 361 | $data->setLabel($label); |
362 | - $data->setName($this->name($label,$name)); |
|
363 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
362 | + $data->setName($this->name($label, $name)); |
|
363 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
364 | 364 | $data->setType("wysiwyg"); |
365 | 365 | |
366 | 366 | columnSingleton()->setColumn($this->index, $data); |
@@ -21,10 +21,10 @@ |
||
21 | 21 | public function options($data_options) { |
22 | 22 | $data = columnSingleton()->getColumn($this->index); |
23 | 23 | |
24 | - foreach($data_options as $key=>$option) { |
|
25 | - if(is_int($key)) { |
|
24 | + foreach ($data_options as $key=>$option) { |
|
25 | + if (is_int($key)) { |
|
26 | 26 | $data_options[$option] = $option; |
27 | - }else{ |
|
27 | + } else { |
|
28 | 28 | $data_options[$key] = $option; |
29 | 29 | } |
30 | 30 | } |
@@ -7,7 +7,7 @@ |
||
7 | 7 | name="{{ $column->getName() }}" id="{{ $column->getName() }}"> |
8 | 8 | <option value="">** Select a {{ $column->getLabel() }}</option> |
9 | 9 | <?php |
10 | - $columnValue = old($column->getName())?:($column->getDefaultValue())?:$column->getValue(); |
|
10 | + $columnValue = old($column->getName()) ?: ($column->getDefaultValue()) ?: $column->getValue(); |
|
11 | 11 | ?> |
12 | 12 | @foreach($column->getOptions() as $key=>$value) |
13 | 13 | <option {{ $columnValue==$key?'selected':'' }} value="{{ $key }}">{{ $value }}</option> |
@@ -21,7 +21,7 @@ |
||
21 | 21 | { |
22 | 22 | $option = $column->getOptions(); |
23 | 23 | $key = $row->{ $column->getField() }; |
24 | - return @$option[ $key ]; |
|
24 | + return @$option[$key]; |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | public function detailRender($row, $column) |
@@ -1,5 +1,5 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -cb()->routeGroupBackend(function () { |
|
4 | - cb()->routePost("select-table-lookup",'\crocodicstudio\crudbooster\types\select_table\SelectTableController@postLookup'); |
|
3 | +cb()->routeGroupBackend(function() { |
|
4 | + cb()->routePost("select-table-lookup", '\crocodicstudio\crudbooster\types\select_table\SelectTableController@postLookup'); |
|
5 | 5 | }); |
6 | 6 | \ No newline at end of file |
@@ -8,7 +8,7 @@ |
||
8 | 8 | <option value="">** Select a {{ $column->getLabel() }}</option> |
9 | 9 | @if(!$column->getForeignKey()) |
10 | 10 | <?php |
11 | - $columnValue = old($column->getName())?:($column->getDefaultValue())?:$column->getValue(); |
|
11 | + $columnValue = old($column->getName()) ?: ($column->getDefaultValue()) ?: $column->getValue(); |
|
12 | 12 | ?> |
13 | 13 | @foreach($column->getOptions() as $key=>$value) |
14 | 14 | <option {{ $columnValue==$key?'selected':'' }} value="{{ $key }}">{{ $value }}</option> |
@@ -41,13 +41,13 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public function optionsFromTable($table, $value_option, $display_option, $SQLCondition = null) { |
43 | 43 | |
44 | - if(strpos($table,"App\Models")!==false) { |
|
44 | + if (strpos($table, "App\Models") !== false) { |
|
45 | 45 | $table = new $table(); |
46 | 46 | $table = $table::$tableName; |
47 | 47 | } |
48 | 48 | |
49 | 49 | $data = DB::table($table); |
50 | - if($SQLCondition && is_callable($SQLCondition)) { |
|
50 | + if ($SQLCondition && is_callable($SQLCondition)) { |
|
51 | 51 | $data = call_user_func($SQLCondition, $data); |
52 | 52 | }elseif ($SQLCondition && is_string($SQLCondition)) { |
53 | 53 | $data->whereRaw($SQLCondition); |
@@ -55,11 +55,11 @@ discard block |
||
55 | 55 | $data = $data->get(); |
56 | 56 | $options = []; |
57 | 57 | foreach ($data as $d) { |
58 | - $options[ $d->$value_option ] = $d->$display_option; |
|
58 | + $options[$d->$value_option] = $d->$display_option; |
|
59 | 59 | } |
60 | 60 | $data = columnSingleton()->getColumn($this->index); |
61 | 61 | /** @var $data SelectTableModel */ |
62 | - $data->setOptionsFromTable(["table"=>$table,"key_field"=>$value_option,"display_field"=>$display_option,"sql_condition"=>$SQLCondition]); |
|
62 | + $data->setOptionsFromTable(["table"=>$table, "key_field"=>$value_option, "display_field"=>$display_option, "sql_condition"=>$SQLCondition]); |
|
63 | 63 | columnSingleton()->setColumn($this->index, $data); |
64 | 64 | |
65 | 65 | $this->options($options); |