@@ -49,20 +49,20 @@ |
||
49 | 49 | return static::$view; |
50 | 50 | } |
51 | 51 | |
52 | - if (view()->exists('admin.widgets.'.static::safeTitle().'.widget')) { |
|
53 | - return 'admin.widgets.'.static::safeTitle().'.widget'; |
|
52 | + if (view()->exists('admin.widgets.' . static::safeTitle() . '.widget')) { |
|
53 | + return 'admin.widgets.' . static::safeTitle() . '.widget'; |
|
54 | 54 | } |
55 | 55 | |
56 | - if (view()->exists('admin.widgets.'.static::safeTitle())) { |
|
57 | - return 'admin.widgets.'.static::safeTitle(); |
|
56 | + if (view()->exists('admin.widgets.' . static::safeTitle())) { |
|
57 | + return 'admin.widgets.' . static::safeTitle(); |
|
58 | 58 | } |
59 | 59 | |
60 | - if (view()->exists('admin.'.static::safeTitle())) { |
|
61 | - return 'admin.'.static::safeTitle(); |
|
60 | + if (view()->exists('admin.' . static::safeTitle())) { |
|
61 | + return 'admin.' . static::safeTitle(); |
|
62 | 62 | } |
63 | 63 | |
64 | - if (view()->exists('flare::'.self::$view)) { |
|
65 | - return 'flare::'.self::$view; |
|
64 | + if (view()->exists('flare::' . self::$view)) { |
|
65 | + return 'flare::' . self::$view; |
|
66 | 66 | } |
67 | 67 | } |
68 | 68 |
@@ -29,19 +29,19 @@ discard block |
||
29 | 29 | // parameter represents the DataTables column identifier. In this case simple |
30 | 30 | // indexes |
31 | 31 | $columns = array( |
32 | - array( 'db' => 'id', 'dt' => 0 ), |
|
33 | - array( 'db' => 'firstname', 'dt' => 1 ), |
|
34 | - array( 'db' => 'surname', 'dt' => 2 ), |
|
35 | - array( 'db' => 'zip', 'dt' => 3 ), |
|
36 | - array( 'db' => 'country', 'dt' => 4 ) |
|
32 | + array( 'db' => 'id', 'dt' => 0 ), |
|
33 | + array( 'db' => 'firstname', 'dt' => 1 ), |
|
34 | + array( 'db' => 'surname', 'dt' => 2 ), |
|
35 | + array( 'db' => 'zip', 'dt' => 3 ), |
|
36 | + array( 'db' => 'country', 'dt' => 4 ) |
|
37 | 37 | ); |
38 | 38 | |
39 | 39 | // SQL server connection information |
40 | 40 | $sql_details = array( |
41 | - 'user' => '', |
|
42 | - 'pass' => '', |
|
43 | - 'db' => '', |
|
44 | - 'host' => '' |
|
41 | + 'user' => '', |
|
42 | + 'pass' => '', |
|
43 | + 'db' => '', |
|
44 | + 'host' => '' |
|
45 | 45 | ); |
46 | 46 | |
47 | 47 | |
@@ -53,6 +53,6 @@ discard block |
||
53 | 53 | require( '../../../../examples/server_side/scripts/ssp.class.php' ); |
54 | 54 | |
55 | 55 | echo json_encode( |
56 | - SSP::simple( $_GET, $sql_details, $table, $primaryKey, $columns ) |
|
56 | + SSP::simple( $_GET, $sql_details, $table, $primaryKey, $columns ) |
|
57 | 57 | ); |
58 | 58 |
@@ -29,11 +29,11 @@ discard block |
||
29 | 29 | // parameter represents the DataTables column identifier. In this case simple |
30 | 30 | // indexes |
31 | 31 | $columns = array( |
32 | - array( 'db' => 'id', 'dt' => 0 ), |
|
33 | - array( 'db' => 'firstname', 'dt' => 1 ), |
|
34 | - array( 'db' => 'surname', 'dt' => 2 ), |
|
35 | - array( 'db' => 'zip', 'dt' => 3 ), |
|
36 | - array( 'db' => 'country', 'dt' => 4 ) |
|
32 | + array('db' => 'id', 'dt' => 0), |
|
33 | + array('db' => 'firstname', 'dt' => 1), |
|
34 | + array('db' => 'surname', 'dt' => 2), |
|
35 | + array('db' => 'zip', 'dt' => 3), |
|
36 | + array('db' => 'country', 'dt' => 4) |
|
37 | 37 | ); |
38 | 38 | |
39 | 39 | // SQL server connection information |
@@ -50,9 +50,9 @@ discard block |
||
50 | 50 | * server-side, there is no need to edit below this line. |
51 | 51 | */ |
52 | 52 | |
53 | -require( '../../../../examples/server_side/scripts/ssp.class.php' ); |
|
53 | +require('../../../../examples/server_side/scripts/ssp.class.php'); |
|
54 | 54 | |
55 | 55 | echo json_encode( |
56 | - SSP::simple( $_GET, $sql_details, $table, $primaryKey, $columns ) |
|
56 | + SSP::simple($_GET, $sql_details, $table, $primaryKey, $columns) |
|
57 | 57 | ); |
58 | 58 |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | if (($methodBreaker = strpos($field, '.')) !== false) { |
150 | 150 | $method = substr($field, 0, $methodBreaker); |
151 | 151 | if (method_exists($this->model, $method)) { |
152 | - if (method_exists($this->model->$method(), $submethod = str_replace($method.'.', '', $field))) { |
|
152 | + if (method_exists($this->model->$method(), $submethod = str_replace($method . '.', '', $field))) { |
|
153 | 153 | $this->model->$method()->$submethod(); |
154 | 154 | |
155 | 155 | $columns[$field] = $fieldTitle; |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | } |
190 | 190 | |
191 | 191 | if ($this->hasGetAccessor($key)) { |
192 | - $method = 'get'.Str::studly($key).'Attribute'; |
|
192 | + $method = 'get' . Str::studly($key) . 'Attribute'; |
|
193 | 193 | |
194 | 194 | return $this->{$method}($model); |
195 | 195 | } |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | */ |
211 | 211 | public function hasGetAccessor($key) |
212 | 212 | { |
213 | - return method_exists($this, 'get'.Str::studly($key).'Attribute'); |
|
213 | + return method_exists($this, 'get' . Str::studly($key) . 'Attribute'); |
|
214 | 214 | } |
215 | 215 | |
216 | 216 | /** |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | if (($methodBreaker = strpos($key, '.')) !== false) { |
256 | 256 | $method = substr($key, 0, $methodBreaker); |
257 | 257 | if (method_exists($model, $method)) { |
258 | - if (method_exists($model->$method, $submethod = str_replace($method.'.', '', $key))) { |
|
258 | + if (method_exists($model->$method, $submethod = str_replace($method . '.', '', $key))) { |
|
259 | 259 | return $model->$method->$submethod(); |
260 | 260 | } |
261 | 261 | |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | public function setAttribute($key, $value) |
280 | 280 | { |
281 | 281 | if ($this->hasSetMutator($key)) { |
282 | - $method = 'set'.Str::studly($key).'Attribute'; |
|
282 | + $method = 'set' . Str::studly($key) . 'Attribute'; |
|
283 | 283 | |
284 | 284 | return $this->{$method}($value); |
285 | 285 | } |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | */ |
297 | 297 | public function hasSetMutator($key) |
298 | 298 | { |
299 | - return method_exists($this, 'set'.Str::studly($key).'Attribute'); |
|
299 | + return method_exists($this, 'set' . Str::studly($key) . 'Attribute'); |
|
300 | 300 | } |
301 | 301 | |
302 | 302 | /** |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | */ |
309 | 309 | public function hasGetMutator($key) |
310 | 310 | { |
311 | - return method_exists($this, 'get'.Str::studly($key).'Attribute'); |
|
311 | + return method_exists($this, 'get' . Str::studly($key) . 'Attribute'); |
|
312 | 312 | } |
313 | 313 | |
314 | 314 | /** |
@@ -447,7 +447,7 @@ discard block |
||
447 | 447 | /** |
448 | 448 | * Determine if the Model Admin has Viewing Capabilities. |
449 | 449 | * |
450 | - * @return bool |
|
450 | + * @return null|boolean |
|
451 | 451 | */ |
452 | 452 | public function hasViewing() |
453 | 453 | { |
@@ -457,7 +457,7 @@ discard block |
||
457 | 457 | /** |
458 | 458 | * Determine if the Model Admin has Creating Capabilities. |
459 | 459 | * |
460 | - * @return bool |
|
460 | + * @return null|boolean |
|
461 | 461 | */ |
462 | 462 | public function hasCreating() |
463 | 463 | { |
@@ -467,7 +467,7 @@ discard block |
||
467 | 467 | /** |
468 | 468 | * Determine if the Model Admin has Cloning Capabilities. |
469 | 469 | * |
470 | - * @return bool |
|
470 | + * @return null|boolean |
|
471 | 471 | */ |
472 | 472 | public function hasCloning() |
473 | 473 | { |
@@ -477,7 +477,7 @@ discard block |
||
477 | 477 | /** |
478 | 478 | * Determine if the Model Admin has Editting Capabilities. |
479 | 479 | * |
480 | - * @return bool |
|
480 | + * @return null|boolean |
|
481 | 481 | */ |
482 | 482 | public function hasEditting() |
483 | 483 | { |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | /** |
488 | 488 | * Determine if the Model Admin has Deleting Capabilities. |
489 | 489 | * |
490 | - * @return bool |
|
490 | + * @return null|boolean |
|
491 | 491 | */ |
492 | 492 | public function hasDeleting() |
493 | 493 | { |
@@ -520,7 +520,7 @@ discard block |
||
520 | 520 | /** |
521 | 521 | * Determine if the Model Admin has Validating Capabilities. |
522 | 522 | * |
523 | - * @return bool |
|
523 | + * @return null|boolean |
|
524 | 524 | */ |
525 | 525 | public function hasValidating() |
526 | 526 | { |
@@ -542,7 +542,7 @@ discard block |
||
542 | 542 | * |
543 | 543 | * @param string $trait |
544 | 544 | * |
545 | - * @return bool |
|
545 | + * @return null|boolean |
|
546 | 546 | */ |
547 | 547 | public function hasTrait($trait = null) |
548 | 548 | { |
@@ -558,7 +558,7 @@ discard block |
||
558 | 558 | * |
559 | 559 | * @param string $contract |
560 | 560 | * |
561 | - * @return bool |
|
561 | + * @return boolean|null |
|
562 | 562 | */ |
563 | 563 | public function hasContract($contract = null) |
564 | 564 | { |
@@ -98,7 +98,7 @@ |
||
98 | 98 | /** |
99 | 99 | * Returns the Application Instance. |
100 | 100 | * |
101 | - * @return mixed |
|
101 | + * @return \Illuminate\Foundation\Application |
|
102 | 102 | */ |
103 | 103 | public function app() |
104 | 104 | { |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | return $this->config[$key]; |
131 | 131 | } |
132 | 132 | |
133 | - return config('flare.'.$key); |
|
133 | + return config('flare.' . $key); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | /** |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | */ |
234 | 234 | public function relativeAdminUrl($path = '') |
235 | 235 | { |
236 | - return rtrim($this->getRelativeAdminUrl().'/'.$path, '/'); |
|
236 | + return rtrim($this->getRelativeAdminUrl() . '/' . $path, '/'); |
|
237 | 237 | } |
238 | 238 | |
239 | 239 | /** |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | */ |
272 | 272 | public function docsUrl($path = '') |
273 | 273 | { |
274 | - return url('#'.$path); |
|
274 | + return url('#' . $path); |
|
275 | 275 | } |
276 | 276 | |
277 | 277 | /** |
@@ -127,7 +127,7 @@ |
||
127 | 127 | /** |
128 | 128 | * Returns the path to a provided file within the Flare package. |
129 | 129 | * |
130 | - * @param bool $fiepath |
|
130 | + * @param bool $filepath |
|
131 | 131 | * |
132 | 132 | * @return string |
133 | 133 | */ |
@@ -133,6 +133,6 @@ |
||
133 | 133 | */ |
134 | 134 | private function basePath($filepath = false) |
135 | 135 | { |
136 | - return __DIR__.'/../'.$filepath; |
|
136 | + return __DIR__ . '/../' . $filepath; |
|
137 | 137 | } |
138 | 138 | } |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | return $this->view; |
213 | 213 | } |
214 | 214 | |
215 | - return 'flare::'.$this->view; |
|
215 | + return 'flare::' . $this->view; |
|
216 | 216 | } |
217 | 217 | |
218 | 218 | /** |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | */ |
369 | 369 | public function relativeUrl($path = '') |
370 | 370 | { |
371 | - return \Flare::relativeAdminUrl($this->urlPrefix().($path ? '/'.$path : '')); |
|
371 | + return \Flare::relativeAdminUrl($this->urlPrefix() . ($path ? '/' . $path : '')); |
|
372 | 372 | } |
373 | 373 | |
374 | 374 | /** |
@@ -392,7 +392,7 @@ discard block |
||
392 | 392 | */ |
393 | 393 | public function relativeCurrentUrl($path) |
394 | 394 | { |
395 | - return \Route::current() ? \Route::current()->getPrefix().'/'.$path : null; |
|
395 | + return \Route::current() ? \Route::current()->getPrefix() . '/' . $path : null; |
|
396 | 396 | } |
397 | 397 | |
398 | 398 | /** |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | { |
114 | 114 | $this->modelAdmin->create(); |
115 | 115 | |
116 | - return redirect($this->modelAdmin->currentUrl())->with('notifications_below_header', [['type' => 'success', 'icon' => 'check-circle', 'title' => 'Success!', 'message' => 'The '.$this->modelAdmin->getTitle().' was successfully created.', 'dismissable' => false]]); |
|
116 | + return redirect($this->modelAdmin->currentUrl())->with('notifications_below_header', [['type' => 'success', 'icon' => 'check-circle', 'title' => 'Success!', 'message' => 'The ' . $this->modelAdmin->getTitle() . ' was successfully created.', 'dismissable' => false]]); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | /** |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | { |
156 | 156 | $this->modelAdmin->edit($modelitem_id); |
157 | 157 | |
158 | - return redirect($this->modelAdmin->currentUrl())->with('notifications_below_header', [['type' => 'success', 'icon' => 'check-circle', 'title' => 'Success!', 'message' => 'The '.$this->modelAdmin->getTitle().' was successfully updated.', 'dismissable' => false]]); |
|
158 | + return redirect($this->modelAdmin->currentUrl())->with('notifications_below_header', [['type' => 'success', 'icon' => 'check-circle', 'title' => 'Success!', 'message' => 'The ' . $this->modelAdmin->getTitle() . ' was successfully updated.', 'dismissable' => false]]); |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | /** |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | { |
188 | 188 | $this->modelAdmin->delete($modelitem_id); |
189 | 189 | |
190 | - return redirect($this->modelAdmin->currentUrl())->with('notifications_below_header', [['type' => 'success', 'icon' => 'check-circle', 'title' => 'Success!', 'message' => 'The '.$this->modelAdmin->getTitle().' was successfully removed.', 'dismissable' => false]]); |
|
190 | + return redirect($this->modelAdmin->currentUrl())->with('notifications_below_header', [['type' => 'success', 'icon' => 'check-circle', 'title' => 'Success!', 'message' => 'The ' . $this->modelAdmin->getTitle() . ' was successfully removed.', 'dismissable' => false]]); |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | /** |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | { |
214 | 214 | $this->modelAdmin->findOnlyTrashed($modelitem_id)->restore(); |
215 | 215 | |
216 | - return redirect($this->modelAdmin->currentUrl())->with('notifications_below_header', [['type' => 'success', 'icon' => 'check-circle', 'title' => 'Success!', 'message' => 'The '.$this->modelAdmin->getTitle().' was successfully restored.', 'dismissable' => false]]); |
|
216 | + return redirect($this->modelAdmin->currentUrl())->with('notifications_below_header', [['type' => 'success', 'icon' => 'check-circle', 'title' => 'Success!', 'message' => 'The ' . $this->modelAdmin->getTitle() . ' was successfully restored.', 'dismissable' => false]]); |
|
217 | 217 | } |
218 | 218 | |
219 | 219 | /** |
@@ -227,6 +227,6 @@ discard block |
||
227 | 227 | { |
228 | 228 | $this->modelAdmin->find($modelitem_id)->replicate($this->modelAdmin->excludeOnClone())->save(); |
229 | 229 | |
230 | - return redirect($this->modelAdmin->currentUrl())->with('notifications_below_header', [['type' => 'success', 'icon' => 'check-circle', 'title' => 'Success!', 'message' => 'The '.$this->modelAdmin->getTitle().' was successfully cloned.', 'dismissable' => false]]); |
|
230 | + return redirect($this->modelAdmin->currentUrl())->with('notifications_below_header', [['type' => 'success', 'icon' => 'check-circle', 'title' => 'Success!', 'message' => 'The ' . $this->modelAdmin->getTitle() . ' was successfully cloned.', 'dismissable' => false]]); |
|
231 | 231 | } |
232 | 232 | } |
@@ -237,7 +237,6 @@ |
||
237 | 237 | /** |
238 | 238 | * Process Restore ModelItem Request. |
239 | 239 | * |
240 | - * @param int $page_id |
|
241 | 240 | * |
242 | 241 | * @return \Illuminate\Http\RedirectResponse |
243 | 242 | */ |
@@ -40,16 +40,16 @@ |
||
40 | 40 | return $this->view; |
41 | 41 | } |
42 | 42 | |
43 | - if (view()->exists('admin.'.$this->urlPrefix().'.index')) { |
|
44 | - return 'admin.'.$this->urlPrefix().'.index'; |
|
43 | + if (view()->exists('admin.' . $this->urlPrefix() . '.index')) { |
|
44 | + return 'admin.' . $this->urlPrefix() . '.index'; |
|
45 | 45 | } |
46 | 46 | |
47 | - if (view()->exists('admin.'.$this->urlPrefix())) { |
|
48 | - return 'admin.'.$this->urlPrefix(); |
|
47 | + if (view()->exists('admin.' . $this->urlPrefix())) { |
|
48 | + return 'admin.' . $this->urlPrefix(); |
|
49 | 49 | } |
50 | 50 | |
51 | - if (view()->exists('flare::'.$this->view)) { |
|
52 | - return 'flare::'.$this->view; |
|
51 | + if (view()->exists('flare::' . $this->view)) { |
|
52 | + return 'flare::' . $this->view; |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | return parent::getView(); |
@@ -33,6 +33,7 @@ |
||
33 | 33 | * Create a new collection. |
34 | 34 | * |
35 | 35 | * @param mixed $items |
36 | + * @param ModelAdmin $modelManager |
|
36 | 37 | */ |
37 | 38 | public function __construct($items = [], $modelManager = null) |
38 | 39 | { |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | */ |
153 | 153 | private function getOptions($name) |
154 | 154 | { |
155 | - $method = 'get'.Str::studly($name).'Options'; |
|
155 | + $method = 'get' . Str::studly($name) . 'Options'; |
|
156 | 156 | |
157 | 157 | return $this->modelManager->{$method}(); |
158 | 158 | } |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | */ |
167 | 167 | public function hasOptionsMethod($key) |
168 | 168 | { |
169 | - return method_exists($this->modelManager, 'get'.Str::studly($key).'Options'); |
|
169 | + return method_exists($this->modelManager, 'get' . Str::studly($key) . 'Options'); |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | /** |