@@ -24,7 +24,7 @@ |
||
24 | 24 | $data = ColumnSingleton()->getColumn($this->index); |
25 | 25 | $data->setFilterable($boolean); |
26 | 26 | $data->setFilterHelp($help_info); |
27 | - $data->setFilterPlaceholder($placeholder?:"Filter by ".$data->getLabel()); |
|
27 | + $data->setFilterPlaceholder($placeholder ?: "Filter by ".$data->getLabel()); |
|
28 | 28 | // Save back |
29 | 29 | columnSingleton()->setColumn($this->index, $data); |
30 | 30 |
@@ -65,8 +65,8 @@ discard block |
||
65 | 65 | $data = new TextModel(); |
66 | 66 | $data = $this->setDefaultModelValue($data); |
67 | 67 | $data->setLabel($label); |
68 | - $data->setName($this->name($label,$name)); |
|
69 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
68 | + $data->setName($this->name($label, $name)); |
|
69 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
70 | 70 | $data->setOrderByColumn($this->table().".".$data->getField()); |
71 | 71 | $data->setFilterColumn($this->table().".".$data->getField()); |
72 | 72 | $data->setType("text"); |
@@ -83,8 +83,8 @@ discard block |
||
83 | 83 | $data = new CheckboxModel(); |
84 | 84 | $data = $this->setDefaultModelValue($data); |
85 | 85 | $data->setLabel($label); |
86 | - $data->setName($this->name($label,$name)); |
|
87 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
86 | + $data->setName($this->name($label, $name)); |
|
87 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
88 | 88 | $data->setOrderByColumn($this->table().".".$data->getField()); |
89 | 89 | $data->setFilterColumn($this->table().".".$data->getField()); |
90 | 90 | $data->setType("checkbox"); |
@@ -101,8 +101,8 @@ discard block |
||
101 | 101 | $data = new PasswordModel(); |
102 | 102 | $data = $this->setDefaultModelValue($data); |
103 | 103 | $data->setLabel($label); |
104 | - $data->setName($this->name($label,$name)); |
|
105 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
104 | + $data->setName($this->name($label, $name)); |
|
105 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
106 | 106 | $data->setOrderByColumn($this->table().".".$data->getField()); |
107 | 107 | $data->setFilterColumn($this->table().".".$data->getField()); |
108 | 108 | $data->setType("password"); |
@@ -121,8 +121,8 @@ discard block |
||
121 | 121 | $data = new ImageModel(); |
122 | 122 | $data = $this->setDefaultModelValue($data); |
123 | 123 | $data->setLabel($label); |
124 | - $data->setName($this->name($label,$name)); |
|
125 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
124 | + $data->setName($this->name($label, $name)); |
|
125 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
126 | 126 | $data->setOrderByColumn($this->table().".".$data->getField()); |
127 | 127 | $data->setFilterColumn($this->table().".".$data->getField()); |
128 | 128 | $data->setType("image"); |
@@ -139,8 +139,8 @@ discard block |
||
139 | 139 | $data = new TextAreaModel(); |
140 | 140 | $data = $this->setDefaultModelValue($data); |
141 | 141 | $data->setLabel($label); |
142 | - $data->setName($this->name($label,$name)); |
|
143 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
142 | + $data->setName($this->name($label, $name)); |
|
143 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
144 | 144 | $data->setOrderByColumn($this->table().".".$data->getField()); |
145 | 145 | $data->setFilterColumn($this->table().".".$data->getField()); |
146 | 146 | $data->setType("text_area"); |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | */ |
166 | 166 | public function addSelectTable($label, $name = null, $selectConfig) |
167 | 167 | { |
168 | - if(isset($selectConfig['table']) && |
|
168 | + if (isset($selectConfig['table']) && |
|
169 | 169 | isset($selectConfig['value_option']) && |
170 | 170 | isset($selectConfig['display_option'])) { |
171 | 171 | $this->index++; |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | $data = new SelectTableModel(); |
174 | 174 | $data = $this->setDefaultModelValue($data); |
175 | 175 | $data->setLabel($label); |
176 | - $data->setName($this->name($label,$name)); |
|
176 | + $data->setName($this->name($label, $name)); |
|
177 | 177 | $data->setField($this->name($label, $name)); |
178 | 178 | $data->setType("select_table"); |
179 | 179 | $data->setOrderByColumn($selectConfig['table'].".".$selectConfig["display_option"]); |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | columnSingleton()->setColumn($this->index, $data); |
182 | 182 | |
183 | 183 | $selectTable = new SelectTable($this->index); |
184 | - $selectTable->optionsFromTable($selectConfig['table'],$selectConfig['value_option'],$selectConfig['display_option'],@$selectConfig['sql_condition']); |
|
184 | + $selectTable->optionsFromTable($selectConfig['table'], $selectConfig['value_option'], $selectConfig['display_option'], @$selectConfig['sql_condition']); |
|
185 | 185 | |
186 | 186 | return $selectTable; |
187 | 187 | } else { |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | $data = new SelectOptionModel(); |
197 | 197 | $data = $this->setDefaultModelValue($data); |
198 | 198 | $data->setLabel($label); |
199 | - $data->setName($this->name($label,$name)); |
|
199 | + $data->setName($this->name($label, $name)); |
|
200 | 200 | $data->setField($this->name($label, $name)); |
201 | 201 | $data->setOrderByColumn($this->table().".".$data->getField()); |
202 | 202 | $data->setFilterColumn($this->table().".".$data->getField()); |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | |
207 | 207 | $selectOption = new SelectOption($this->index); |
208 | 208 | |
209 | - if($options) { |
|
209 | + if ($options) { |
|
210 | 210 | $selectOption->options($options); |
211 | 211 | } |
212 | 212 | |
@@ -221,8 +221,8 @@ discard block |
||
221 | 221 | $data = new CustomModel(); |
222 | 222 | $data = $this->setDefaultModelValue($data); |
223 | 223 | $data->setLabel($label); |
224 | - $data->setName($this->name($label,$name)); |
|
225 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
224 | + $data->setName($this->name($label, $name)); |
|
225 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
226 | 226 | $data->setOrderByColumn($this->table().".".$data->getField()); |
227 | 227 | $data->setFilterColumn($this->table().".".$data->getField()); |
228 | 228 | $data->setType("custom"); |
@@ -239,8 +239,8 @@ discard block |
||
239 | 239 | $data = new DateModel(); |
240 | 240 | $data = $this->setDefaultModelValue($data); |
241 | 241 | $data->setLabel($label); |
242 | - $data->setName($this->name($label,$name)); |
|
243 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
242 | + $data->setName($this->name($label, $name)); |
|
243 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
244 | 244 | $data->setOrderByColumn($this->table().".".$data->getField()); |
245 | 245 | $data->setFilterColumn($this->table().".".$data->getField()); |
246 | 246 | $data->setType("date"); |
@@ -257,8 +257,8 @@ discard block |
||
257 | 257 | $data = new TimeModel(); |
258 | 258 | $data = $this->setDefaultModelValue($data); |
259 | 259 | $data->setLabel($label); |
260 | - $data->setName($this->name($label,$name)); |
|
261 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
260 | + $data->setName($this->name($label, $name)); |
|
261 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
262 | 262 | $data->setOrderByColumn($this->table().".".$data->getField()); |
263 | 263 | $data->setFilterColumn($this->table().".".$data->getField()); |
264 | 264 | $data->setType("time"); |
@@ -275,8 +275,8 @@ discard block |
||
275 | 275 | $data = new DatetimeModel(); |
276 | 276 | $data = $this->setDefaultModelValue($data); |
277 | 277 | $data->setLabel($label); |
278 | - $data->setName($this->name($label,$name)); |
|
279 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
278 | + $data->setName($this->name($label, $name)); |
|
279 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
280 | 280 | $data->setOrderByColumn($this->table().".".$data->getField()); |
281 | 281 | $data->setFilterColumn($this->table().".".$data->getField()); |
282 | 282 | $data->setType("datetime"); |
@@ -293,8 +293,8 @@ discard block |
||
293 | 293 | $data = new EmailModel(); |
294 | 294 | $data = $this->setDefaultModelValue($data); |
295 | 295 | $data->setLabel($label); |
296 | - $data->setName($this->name($label,$name)); |
|
297 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
296 | + $data->setName($this->name($label, $name)); |
|
297 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
298 | 298 | $data->setOrderByColumn($this->table().".".$data->getField()); |
299 | 299 | $data->setFilterColumn($this->table().".".$data->getField()); |
300 | 300 | $data->setType("email"); |
@@ -311,8 +311,8 @@ discard block |
||
311 | 311 | $data = new FileModel(); |
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->setOrderByColumn($this->table().".".$data->getField()); |
317 | 317 | $data->setFilterColumn($this->table().".".$data->getField()); |
318 | 318 | $data->setType("file"); |
@@ -330,8 +330,8 @@ discard block |
||
330 | 330 | $data = new HiddenModel(); |
331 | 331 | $data = $this->setDefaultModelValue($data); |
332 | 332 | $data->setLabel($label); |
333 | - $data->setName($this->name($label,$name)); |
|
334 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
333 | + $data->setName($this->name($label, $name)); |
|
334 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
335 | 335 | $data->setOrderByColumn($this->table().".".$data->getField()); |
336 | 336 | $data->setFilterColumn($this->table().".".$data->getField()); |
337 | 337 | $data->setType("hidden"); |
@@ -348,8 +348,8 @@ discard block |
||
348 | 348 | $data = new NumberModel(); |
349 | 349 | $data = $this->setDefaultModelValue($data); |
350 | 350 | $data->setLabel($label); |
351 | - $data->setName($this->name($label,$name)); |
|
352 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
351 | + $data->setName($this->name($label, $name)); |
|
352 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
353 | 353 | $data->setOrderByColumn($this->table().".".$data->getField()); |
354 | 354 | $data->setFilterColumn($this->table().".".$data->getField()); |
355 | 355 | $data->setType("number"); |
@@ -366,8 +366,8 @@ discard block |
||
366 | 366 | $data = new MoneyModel(); |
367 | 367 | $data = $this->setDefaultModelValue($data); |
368 | 368 | $data->setLabel($label); |
369 | - $data->setName($this->name($label,$name)); |
|
370 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
369 | + $data->setName($this->name($label, $name)); |
|
370 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
371 | 371 | $data->setOrderByColumn($this->table().".".$data->getField()); |
372 | 372 | $data->setFilterColumn($this->table().".".$data->getField()); |
373 | 373 | $data->setType("money"); |
@@ -384,8 +384,8 @@ discard block |
||
384 | 384 | $data = new RadioModel(); |
385 | 385 | $data = $this->setDefaultModelValue($data); |
386 | 386 | $data->setLabel($label); |
387 | - $data->setName($this->name($label,$name)); |
|
388 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
387 | + $data->setName($this->name($label, $name)); |
|
388 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
389 | 389 | $data->setOrderByColumn($this->table().".".$data->getField()); |
390 | 390 | $data->setFilterColumn($this->table().".".$data->getField()); |
391 | 391 | $data->setType("radio"); |
@@ -402,8 +402,8 @@ discard block |
||
402 | 402 | $data = new WysiwygModel(); |
403 | 403 | $data = $this->setDefaultModelValue($data); |
404 | 404 | $data->setLabel($label); |
405 | - $data->setName($this->name($label,$name)); |
|
406 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
405 | + $data->setName($this->name($label, $name)); |
|
406 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
407 | 407 | $data->setOrderByColumn($this->table().".".$data->getField()); |
408 | 408 | $data->setFilterColumn($this->table().".".$data->getField()); |
409 | 409 | $data->setType("wysiwyg"); |