We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | <!-- elFinder JS (REQUIRED) --> |
18 | 18 | <script src="<?= asset($dir.'/js/elfinder.min.js') ?>"></script> |
19 | 19 | |
20 | - <?php if($locale){ ?> |
|
20 | + <?php if ($locale) { ?> |
|
21 | 21 | <!-- elFinder translation (OPTIONAL) --> |
22 | 22 | <script src="<?= asset($dir."/js/i18n/elfinder.$locale.js") ?>"></script> |
23 | 23 | <?php } ?> |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | $().ready(function() { |
41 | 41 | var elf = $('#elfinder').elfinder({ |
42 | 42 | // set your elFinder options here |
43 | - <?php if($locale){ ?> |
|
43 | + <?php if ($locale) { ?> |
|
44 | 44 | lang: '<?= $locale ?>', // locale |
45 | 45 | <?php } ?> |
46 | 46 | customData: { |
@@ -71,8 +71,7 @@ |
||
71 | 71 | if ($results && $results->count()) { |
72 | 72 | $results_array = $results->lists($column['attribute'], 'id'); |
73 | 73 | echo implode(', ', $results_array->toArray()); |
74 | - } |
|
75 | - else |
|
74 | + } else |
|
76 | 75 | { |
77 | 76 | echo '-'; |
78 | 77 | } |
@@ -20,42 +20,42 @@ discard block |
||
20 | 20 | |
21 | 21 | @section('content') |
22 | 22 | <?php |
23 | - function tree_element($entry, $key, $all_entries, $crud) |
|
24 | - { |
|
23 | + function tree_element($entry, $key, $all_entries, $crud) |
|
24 | + { |
|
25 | 25 | if (!isset($entry->tree_element_shown)) { |
26 | - // mark the element as shown |
|
27 | - $all_entries[$key]->tree_element_shown = true; |
|
28 | - $entry->tree_element_shown = true; |
|
26 | + // mark the element as shown |
|
27 | + $all_entries[$key]->tree_element_shown = true; |
|
28 | + $entry->tree_element_shown = true; |
|
29 | 29 | |
30 | - // show the tree element |
|
31 | - echo '<li id="list_'.$entry->id.'">'; |
|
32 | - echo '<div><span class="disclose"><span></span></span>'.$entry->{$crud->reorder_label}.'</div>'; |
|
30 | + // show the tree element |
|
31 | + echo '<li id="list_'.$entry->id.'">'; |
|
32 | + echo '<div><span class="disclose"><span></span></span>'.$entry->{$crud->reorder_label}.'</div>'; |
|
33 | 33 | |
34 | - // see if this element has any children |
|
35 | - $children = []; |
|
36 | - foreach ($all_entries as $key => $subentry) { |
|
34 | + // see if this element has any children |
|
35 | + $children = []; |
|
36 | + foreach ($all_entries as $key => $subentry) { |
|
37 | 37 | if ($subentry->parent_id == $entry->id) { |
38 | - $children[] = $subentry; |
|
38 | + $children[] = $subentry; |
|
39 | + } |
|
39 | 40 | } |
40 | - } |
|
41 | 41 | |
42 | - $children = collect($children)->sortBy('lft'); |
|
42 | + $children = collect($children)->sortBy('lft'); |
|
43 | 43 | |
44 | - // if it does have children, show them |
|
45 | - if (count($children)) { |
|
44 | + // if it does have children, show them |
|
45 | + if (count($children)) { |
|
46 | 46 | echo '<ol>'; |
47 | 47 | foreach ($children as $key => $child) { |
48 | - $children[$key] = tree_element($child, $child->id, $all_entries, $crud); |
|
48 | + $children[$key] = tree_element($child, $child->id, $all_entries, $crud); |
|
49 | 49 | } |
50 | 50 | echo '</ol>'; |
51 | - } |
|
52 | - echo '</li>'; |
|
51 | + } |
|
52 | + echo '</li>'; |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | return $entry; |
56 | - } |
|
56 | + } |
|
57 | 57 | |
58 | - ?> |
|
58 | + ?> |
|
59 | 59 | <div class="row"> |
60 | 60 | <div class="col-md-8 col-md-offset-2"> |
61 | 61 | @if ($crud->hasAccess('list')) |
@@ -87,15 +87,15 @@ discard block |
||
87 | 87 | |
88 | 88 | <ol class="sortable"> |
89 | 89 | <?php |
90 | - $all_entries = collect($entries->all())->sortBy('lft')->keyBy('id'); |
|
91 | - $root_entries = $all_entries->filter(function($item) { |
|
90 | + $all_entries = collect($entries->all())->sortBy('lft')->keyBy('id'); |
|
91 | + $root_entries = $all_entries->filter(function($item) { |
|
92 | 92 | return $item->parent_id == 0; |
93 | - }); |
|
94 | - ?> |
|
93 | + }); |
|
94 | + ?> |
|
95 | 95 | @foreach ($root_entries as $key => $entry) |
96 | 96 | <?php |
97 | 97 | $root_entries[$key] = tree_element($entry, $key, $all_entries, $crud); |
98 | - ?> |
|
98 | + ?> |
|
99 | 99 | @endforeach |
100 | 100 | </ol> |
101 | 101 |
@@ -15,15 +15,15 @@ discard block |
||
15 | 15 | $dependencyArray = []; |
16 | 16 | |
17 | 17 | //convert dependency array to simple matrix ( prymary id as key and array with secondaries id ) |
18 | - foreach($dependencies as $primary){ |
|
18 | + foreach ($dependencies as $primary) { |
|
19 | 19 | $dependencyArray[$primary->id] = []; |
20 | - foreach($primary->{$primary_dependency['entity_secondary']} as $secondary){ |
|
20 | + foreach ($primary->{$primary_dependency['entity_secondary']} as $secondary) { |
|
21 | 21 | $dependencyArray[$primary->id][] = $secondary->id; |
22 | 22 | } |
23 | 23 | } |
24 | 24 | |
25 | 25 | //for update form, get initial state of the entity |
26 | - if( isset($id) && $id ){ |
|
26 | + if (isset($id) && $id) { |
|
27 | 27 | |
28 | 28 | //get entity with relations for primary dependency |
29 | 29 | $entity_dependencies = $entity_model->with($primary_dependency['entity']) |
@@ -39,15 +39,15 @@ discard block |
||
39 | 39 | $secondary_ids = []; |
40 | 40 | |
41 | 41 | //create secondary dependency from primary relation, used to check what chekbox must be check from second checklist |
42 | - if( old($primary_dependency['name']) ) { |
|
43 | - foreach( old($primary_dependency['name']) as $primary_item ){ |
|
44 | - foreach($dependencyArray[$primary_item] as $second_item ){ |
|
42 | + if (old($primary_dependency['name'])) { |
|
43 | + foreach (old($primary_dependency['name']) as $primary_item) { |
|
44 | + foreach ($dependencyArray[$primary_item] as $second_item) { |
|
45 | 45 | $secondary_ids[$second_item] = $second_item; |
46 | 46 | } |
47 | 47 | } |
48 | - }else{ //create dependecies from relation if not from validate error |
|
49 | - foreach( $primary_array as $primary_item ){ |
|
50 | - foreach($primary_item[$secondary_dependency['entity']] as $second_item ){ |
|
48 | + } else { //create dependecies from relation if not from validate error |
|
49 | + foreach ($primary_array as $primary_item) { |
|
50 | + foreach ($primary_item[$secondary_dependency['entity']] as $second_item) { |
|
51 | 51 | $secondary_ids[$second_item['id']] = $second_item['id']; |
52 | 52 | } |
53 | 53 | } |
@@ -45,7 +45,7 @@ |
||
45 | 45 | $secondary_ids[$second_item] = $second_item; |
46 | 46 | } |
47 | 47 | } |
48 | - }else{ //create dependecies from relation if not from validate error |
|
48 | + } else{ //create dependecies from relation if not from validate error |
|
49 | 49 | foreach( $primary_array as $primary_item ){ |
50 | 50 | foreach($primary_item[$secondary_dependency['entity']] as $second_item ){ |
51 | 51 | $secondary_ids[$second_item['id']] = $second_item['id']; |
@@ -2,34 +2,34 @@ discard block |
||
2 | 2 | <div class="form-group checklist_dependency" data-entity ="{{ $field['field_unique_name'] }}"> |
3 | 3 | <label>{{ $field['label'] }}</label> |
4 | 4 | <?php |
5 | - $entity_model = $crud->getModel(); |
|
5 | + $entity_model = $crud->getModel(); |
|
6 | 6 | |
7 | - //short name for dependency fields |
|
8 | - $primary_dependency = $field['subfields']['primary']; |
|
9 | - $secondary_dependency = $field['subfields']['secondary']; |
|
7 | + //short name for dependency fields |
|
8 | + $primary_dependency = $field['subfields']['primary']; |
|
9 | + $secondary_dependency = $field['subfields']['secondary']; |
|
10 | 10 | |
11 | 11 | |
12 | - //all items with relation |
|
13 | - $dependencies = $primary_dependency['model']::with($primary_dependency['entity_secondary'])->get(); |
|
12 | + //all items with relation |
|
13 | + $dependencies = $primary_dependency['model']::with($primary_dependency['entity_secondary'])->get(); |
|
14 | 14 | |
15 | - $dependencyArray = []; |
|
15 | + $dependencyArray = []; |
|
16 | 16 | |
17 | - //convert dependency array to simple matrix ( prymary id as key and array with secondaries id ) |
|
18 | - foreach($dependencies as $primary){ |
|
19 | - $dependencyArray[$primary->id] = []; |
|
17 | + //convert dependency array to simple matrix ( prymary id as key and array with secondaries id ) |
|
18 | + foreach($dependencies as $primary){ |
|
19 | + $dependencyArray[$primary->id] = []; |
|
20 | 20 | foreach($primary->{$primary_dependency['entity_secondary']} as $secondary){ |
21 | 21 | $dependencyArray[$primary->id][] = $secondary->id; |
22 | 22 | } |
23 | - } |
|
23 | + } |
|
24 | 24 | |
25 | - //for update form, get initial state of the entity |
|
26 | - if( isset($id) && $id ){ |
|
25 | + //for update form, get initial state of the entity |
|
26 | + if( isset($id) && $id ){ |
|
27 | 27 | |
28 | 28 | //get entity with relations for primary dependency |
29 | 29 | $entity_dependencies = $entity_model->with($primary_dependency['entity']) |
30 | - ->with($primary_dependency['entity'].'.'.$primary_dependency['entity_secondary']) |
|
31 | - ->where('id', $id) |
|
32 | - ->first(); |
|
30 | + ->with($primary_dependency['entity'].'.'.$primary_dependency['entity_secondary']) |
|
31 | + ->where('id', $id) |
|
32 | + ->first(); |
|
33 | 33 | |
34 | 34 | $secondaries_from_primary = []; |
35 | 35 | |
@@ -40,23 +40,23 @@ discard block |
||
40 | 40 | |
41 | 41 | //create secondary dependency from primary relation, used to check what chekbox must be check from second checklist |
42 | 42 | if( old($primary_dependency['name']) ) { |
43 | - foreach( old($primary_dependency['name']) as $primary_item ){ |
|
43 | + foreach( old($primary_dependency['name']) as $primary_item ){ |
|
44 | 44 | foreach($dependencyArray[$primary_item] as $second_item ){ |
45 | 45 | $secondary_ids[$second_item] = $second_item; |
46 | 46 | } |
47 | - } |
|
47 | + } |
|
48 | 48 | }else{ //create dependecies from relation if not from validate error |
49 | - foreach( $primary_array as $primary_item ){ |
|
49 | + foreach( $primary_array as $primary_item ){ |
|
50 | 50 | foreach($primary_item[$secondary_dependency['entity']] as $second_item ){ |
51 | 51 | $secondary_ids[$second_item['id']] = $second_item['id']; |
52 | 52 | } |
53 | - } |
|
53 | + } |
|
54 | 54 | } |
55 | 55 | |
56 | - } |
|
56 | + } |
|
57 | 57 | |
58 | - //json encode of dependency matrix |
|
59 | - $dependencyJson = json_encode($dependencyArray); |
|
58 | + //json encode of dependency matrix |
|
59 | + $dependencyJson = json_encode($dependencyArray); |
|
60 | 60 | ?> |
61 | 61 | <script> |
62 | 62 | var {{ $field['field_unique_name'] }} = {!! $dependencyJson !!}; |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <!-- select2 --> |
2 | 2 | <div class="form-group"> |
3 | 3 | <label>{{ $field['label'] }}</label> |
4 | - <?php $entity_model = $crud->getModel();?> |
|
4 | + <?php $entity_model = $crud->getModel(); ?> |
|
5 | 5 | |
6 | 6 | <div class="row"> |
7 | 7 | @foreach ($field['model']::all() as $connected_entity_entry) |
@@ -66,7 +66,7 @@ |
||
66 | 66 | |
67 | 67 | private function registerCRUD() |
68 | 68 | { |
69 | - $this->app->bind('CRUD', function ($app) { |
|
69 | + $this->app->bind('CRUD', function($app) { |
|
70 | 70 | return new CRUD($app); |
71 | 71 | }); |
72 | 72 | } |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | // TODO |
166 | 166 | } |
167 | 167 | |
168 | - /* |
|
168 | + /* |
|
169 | 169 | |-------------------------------------------------------------------------- |
170 | 170 | | READ |
171 | 171 | |-------------------------------------------------------------------------- |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | $this->details_row = false; |
247 | 247 | } |
248 | 248 | |
249 | - /* |
|
249 | + /* |
|
250 | 250 | |-------------------------------------------------------------------------- |
251 | 251 | | UPDATE |
252 | 252 | |-------------------------------------------------------------------------- |
@@ -306,7 +306,7 @@ discard block |
||
306 | 306 | return $fields; |
307 | 307 | } |
308 | 308 | |
309 | - /* |
|
309 | + /* |
|
310 | 310 | |-------------------------------------------------------------------------- |
311 | 311 | | DELETE |
312 | 312 | |-------------------------------------------------------------------------- |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | return $this->reorder; |
392 | 392 | } |
393 | 393 | |
394 | - /* |
|
394 | + /* |
|
395 | 395 | |-------------------------------------------------------------------------- |
396 | 396 | | CRUD ACCESS |
397 | 397 | |-------------------------------------------------------------------------- |
@@ -316,6 +316,7 @@ discard block |
||
316 | 316 | * Delete a row from the database. |
317 | 317 | * |
318 | 318 | * @param [int] The id of the item to be deleted. |
319 | + * @param integer $id |
|
319 | 320 | * |
320 | 321 | * @return [bool] Deletion confirmation. |
321 | 322 | * |
@@ -429,8 +430,9 @@ discard block |
||
429 | 430 | * Check if a permission is enabled for a Crud Panel. Fail if not. |
430 | 431 | * |
431 | 432 | * @param [string] Permission. |
433 | + * @param string $permission |
|
432 | 434 | * |
433 | - * @return bool |
|
435 | + * @return boolean|null |
|
434 | 436 | */ |
435 | 437 | public function hasAccessOrFail($permission) |
436 | 438 | { |
@@ -662,6 +664,9 @@ discard block |
||
662 | 664 | return $this->removeColumns([$column]); |
663 | 665 | } |
664 | 666 | |
667 | + /** |
|
668 | + * @param string $entity |
|
669 | + */ |
|
665 | 670 | public function remove($entity, $fields) |
666 | 671 | { |
667 | 672 | return array_values(array_filter($this->{$entity}, function ($field) use ($fields) { return ! in_array($field['name'], (array) $fields); })); |
@@ -713,8 +718,6 @@ discard block |
||
713 | 718 | /** |
714 | 719 | * Add a field to the create/update form or both. |
715 | 720 | * |
716 | - * @param [string] $name Field name (the column name in the db in most cases) |
|
717 | - * @param [array] $options Field-type-specific information. |
|
718 | 721 | * @param string $form The form to add the field to (create/update/both) |
719 | 722 | */ |
720 | 723 | public function addField($field, $form = 'both') |
@@ -1265,6 +1268,9 @@ discard block |
||
1265 | 1268 | $this->setSort('fields', (array) $order); |
1266 | 1269 | } |
1267 | 1270 | |
1271 | + /** |
|
1272 | + * @param string $type |
|
1273 | + */ |
|
1268 | 1274 | public function sync($type, $fields, $attributes) |
1269 | 1275 | { |
1270 | 1276 | if (! empty($this->{$type})) { |
@@ -1278,11 +1284,17 @@ discard block |
||
1278 | 1284 | } |
1279 | 1285 | } |
1280 | 1286 | |
1287 | + /** |
|
1288 | + * @param string $items |
|
1289 | + */ |
|
1281 | 1290 | public function setSort($items, $order) |
1282 | 1291 | { |
1283 | 1292 | $this->sort[$items] = $order; |
1284 | 1293 | } |
1285 | 1294 | |
1295 | + /** |
|
1296 | + * @param string $items |
|
1297 | + */ |
|
1286 | 1298 | public function sort($items) |
1287 | 1299 | { |
1288 | 1300 | if (array_key_exists($items, $this->sort)) { |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | |
285 | 285 | foreach ($fields as $k => $field) { |
286 | 286 | // set the value |
287 | - if (! isset($fields[$k]['value'])) { |
|
287 | + if (!isset($fields[$k]['value'])) { |
|
288 | 288 | if (isset($field['subfields'])) { |
289 | 289 | $fields[$k]['value'] = []; |
290 | 290 | foreach ($field['subfields'] as $key => $subfield) { |
@@ -418,7 +418,7 @@ discard block |
||
418 | 418 | */ |
419 | 419 | public function hasAccess($permission) |
420 | 420 | { |
421 | - if (! in_array($permission, $this->access)) { |
|
421 | + if (!in_array($permission, $this->access)) { |
|
422 | 422 | return false; |
423 | 423 | } |
424 | 424 | |
@@ -453,7 +453,7 @@ discard block |
||
453 | 453 | public function hasAccessToAll($permission_array) |
454 | 454 | { |
455 | 455 | foreach ($permission_array as $key => $permission) { |
456 | - if (! in_array($permission, $this->access)) { |
|
456 | + if (!in_array($permission, $this->access)) { |
|
457 | 457 | return false; |
458 | 458 | } |
459 | 459 | } |
@@ -470,7 +470,7 @@ discard block |
||
470 | 470 | */ |
471 | 471 | public function hasAccessOrFail($permission) |
472 | 472 | { |
473 | - if (! in_array($permission, $this->access)) { |
|
473 | + if (!in_array($permission, $this->access)) { |
|
474 | 474 | abort(403, trans('backpack::crud.unauthorized_access')); |
475 | 475 | } |
476 | 476 | } |
@@ -493,7 +493,7 @@ discard block |
||
493 | 493 | */ |
494 | 494 | public function setModel($model_namespace) |
495 | 495 | { |
496 | - if (! class_exists($model_namespace)) { |
|
496 | + if (!class_exists($model_namespace)) { |
|
497 | 497 | throw new \Exception('This model does not exist.', 404); |
498 | 498 | } |
499 | 499 | |
@@ -537,7 +537,7 @@ discard block |
||
537 | 537 | { |
538 | 538 | $complete_route = $route.'.index'; |
539 | 539 | |
540 | - if (! \Route::has($complete_route)) { |
|
540 | + if (!\Route::has($complete_route)) { |
|
541 | 541 | throw new \Exception('There are no routes for this route name.', 404); |
542 | 542 | } |
543 | 543 | |
@@ -623,7 +623,7 @@ discard block |
||
623 | 623 | public function addColumn($column) |
624 | 624 | { |
625 | 625 | // if a string was passed, not an array, change it to an array |
626 | - if (! is_array($column)) { |
|
626 | + if (!is_array($column)) { |
|
627 | 627 | $column = ['name' => $column]; |
628 | 628 | } |
629 | 629 | |
@@ -674,7 +674,7 @@ discard block |
||
674 | 674 | */ |
675 | 675 | public function addDefaultLabel($array) |
676 | 676 | { |
677 | - if (! array_key_exists('label', (array) $array) && array_key_exists('name', (array) $array)) { |
|
677 | + if (!array_key_exists('label', (array) $array) && array_key_exists('name', (array) $array)) { |
|
678 | 678 | $array = array_merge(['label' => ucfirst($this->makeLabel($array['name']))], $array); |
679 | 679 | |
680 | 680 | return $array; |
@@ -705,8 +705,8 @@ discard block |
||
705 | 705 | |
706 | 706 | public function remove($entity, $fields) |
707 | 707 | { |
708 | - return array_values(array_filter($this->{$entity}, function ($field) use ($fields) { |
|
709 | - return ! in_array($field['name'], (array) $fields); |
|
708 | + return array_values(array_filter($this->{$entity}, function($field) use ($fields) { |
|
709 | + return !in_array($field['name'], (array) $fields); |
|
710 | 710 | })); |
711 | 711 | } |
712 | 712 | |
@@ -771,12 +771,12 @@ discard block |
||
771 | 771 | } |
772 | 772 | |
773 | 773 | // if the label is missing, we should set it |
774 | - if (! isset($complete_field_array['label'])) { |
|
774 | + if (!isset($complete_field_array['label'])) { |
|
775 | 775 | $complete_field_array['label'] = ucfirst($complete_field_array['name']); |
776 | 776 | } |
777 | 777 | |
778 | 778 | // if the field type is missing, we should set it |
779 | - if (! isset($complete_field_array['type'])) { |
|
779 | + if (!isset($complete_field_array['type'])) { |
|
780 | 780 | $complete_field_array['type'] = $this->getFieldTypeFromDbColumnType($complete_field_array['name']); |
781 | 781 | } |
782 | 782 | |
@@ -838,7 +838,7 @@ discard block |
||
838 | 838 | */ |
839 | 839 | public function removeFields($array_of_names, $form = 'both') |
840 | 840 | { |
841 | - if (! empty($array_of_names)) { |
|
841 | + if (!empty($array_of_names)) { |
|
842 | 842 | foreach ($array_of_names as $name) { |
843 | 843 | $this->removeField($name, $form); |
844 | 844 | } |
@@ -969,7 +969,7 @@ discard block |
||
969 | 969 | { |
970 | 970 | $this->getDbColumnTypes(); |
971 | 971 | |
972 | - array_map(function ($field) { |
|
972 | + array_map(function($field) { |
|
973 | 973 | // $this->labels[$field] = $this->makeLabel($field); |
974 | 974 | |
975 | 975 | $new_field = [ |
@@ -983,7 +983,7 @@ discard block |
||
983 | 983 | $this->create_fields[] = $new_field; |
984 | 984 | $this->update_fields[] = $new_field; |
985 | 985 | |
986 | - if (! in_array($field, $this->model->getHidden())) { |
|
986 | + if (!in_array($field, $this->model->getHidden())) { |
|
987 | 987 | $this->columns[] = [ |
988 | 988 | 'name' => $field, |
989 | 989 | 'label' => ucfirst($field), |
@@ -1016,7 +1016,7 @@ discard block |
||
1016 | 1016 | */ |
1017 | 1017 | public function getFieldTypeFromDbColumnType($field) |
1018 | 1018 | { |
1019 | - if (! array_key_exists($field, $this->field_types)) { |
|
1019 | + if (!array_key_exists($field, $this->field_types)) { |
|
1020 | 1020 | return 'text'; |
1021 | 1021 | } |
1022 | 1022 | |
@@ -1097,7 +1097,7 @@ discard block |
||
1097 | 1097 | $columns = \Schema::getColumnListing($this->model->getTable()); |
1098 | 1098 | $fillable = $this->model->getFillable(); |
1099 | 1099 | |
1100 | - if (! empty($fillable)) { |
|
1100 | + if (!empty($fillable)) { |
|
1101 | 1101 | $columns = array_intersect($columns, $fillable); |
1102 | 1102 | } |
1103 | 1103 | |
@@ -1145,7 +1145,7 @@ discard block |
||
1145 | 1145 | // remove the fake field |
1146 | 1146 | array_pull($request, $fields[$k]['name']); |
1147 | 1147 | |
1148 | - if (! in_array($fields[$k]['store_in'], $fake_field_columns_to_encode, true)) { |
|
1148 | + if (!in_array($fields[$k]['store_in'], $fake_field_columns_to_encode, true)) { |
|
1149 | 1149 | array_push($fake_field_columns_to_encode, $fields[$k]['store_in']); |
1150 | 1150 | } |
1151 | 1151 | } else { |
@@ -1156,7 +1156,7 @@ discard block |
||
1156 | 1156 | // remove the fake field |
1157 | 1157 | array_pull($request, $fields[$k]['name']); |
1158 | 1158 | |
1159 | - if (! in_array('extras', $fake_field_columns_to_encode, true)) { |
|
1159 | + if (!in_array('extras', $fake_field_columns_to_encode, true)) { |
|
1160 | 1160 | array_push($fake_field_columns_to_encode, 'extras'); |
1161 | 1161 | } |
1162 | 1162 | } |
@@ -1199,20 +1199,20 @@ discard block |
||
1199 | 1199 | if (isset($fields[$k]['fake']) && $fields[$k]['fake'] == true) { |
1200 | 1200 | // add it to the request in its appropriate variable - the one defined, if defined |
1201 | 1201 | if (isset($fields[$k]['store_in'])) { |
1202 | - if (! in_array($fields[$k]['store_in'], $fake_field_columns_to_encode, true)) { |
|
1202 | + if (!in_array($fields[$k]['store_in'], $fake_field_columns_to_encode, true)) { |
|
1203 | 1203 | array_push($fake_field_columns_to_encode, $fields[$k]['store_in']); |
1204 | 1204 | } |
1205 | 1205 | } else { |
1206 | 1206 | //otherwise in the one defined in the $crud variable |
1207 | 1207 | |
1208 | - if (! in_array('extras', $fake_field_columns_to_encode, true)) { |
|
1208 | + if (!in_array('extras', $fake_field_columns_to_encode, true)) { |
|
1209 | 1209 | array_push($fake_field_columns_to_encode, 'extras'); |
1210 | 1210 | } |
1211 | 1211 | } |
1212 | 1212 | } |
1213 | 1213 | } |
1214 | 1214 | |
1215 | - if (! count($fake_field_columns_to_encode)) { |
|
1215 | + if (!count($fake_field_columns_to_encode)) { |
|
1216 | 1216 | return ['extras']; |
1217 | 1217 | } |
1218 | 1218 | |
@@ -1233,7 +1233,7 @@ discard block |
||
1233 | 1233 | */ |
1234 | 1234 | public function getFirstOfItsTypeInArray($type, $array) |
1235 | 1235 | { |
1236 | - return array_first($array, function ($key, $item) use ($type) { |
|
1236 | + return array_first($array, function($key, $item) use ($type) { |
|
1237 | 1237 | return $item['type'] == $type; |
1238 | 1238 | }); |
1239 | 1239 | } |
@@ -1270,7 +1270,7 @@ discard block |
||
1270 | 1270 | |
1271 | 1271 | public function showButtons() |
1272 | 1272 | { |
1273 | - return ! empty($this->buttons) && ! (count($this->buttons) == 1 && array_key_exists('add', $this->buttons)); |
|
1273 | + return !empty($this->buttons) && !(count($this->buttons) == 1 && array_key_exists('add', $this->buttons)); |
|
1274 | 1274 | } |
1275 | 1275 | |
1276 | 1276 | public function initButtons() |
@@ -1309,8 +1309,8 @@ discard block |
||
1309 | 1309 | |
1310 | 1310 | public function sync($type, $fields, $attributes) |
1311 | 1311 | { |
1312 | - if (! empty($this->{$type})) { |
|
1313 | - $this->{$type} = array_map(function ($field) use ($fields, $attributes) { |
|
1312 | + if (!empty($this->{$type})) { |
|
1313 | + $this->{$type} = array_map(function($field) use ($fields, $attributes) { |
|
1314 | 1314 | if (in_array($field['name'], (array) $fields)) { |
1315 | 1315 | $field = array_merge($field, $attributes); |
1316 | 1316 | } |
@@ -1336,8 +1336,8 @@ discard block |
||
1336 | 1336 | } |
1337 | 1337 | } |
1338 | 1338 | |
1339 | - return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function ($item) use ($items) { |
|
1340 | - return ! in_array($item['name'], $this->sort[$items]); |
|
1339 | + return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use ($items) { |
|
1340 | + return !in_array($item['name'], $this->sort[$items]); |
|
1341 | 1341 | })); |
1342 | 1342 | } |
1343 | 1343 |
@@ -69,7 +69,7 @@ |
||
69 | 69 | * |
70 | 70 | * @param array $columns - the database columns that contain the JSONs |
71 | 71 | * |
72 | - * @return Model |
|
72 | + * @return CrudTrait |
|
73 | 73 | */ |
74 | 74 | public function withFakes($columns = []) |
75 | 75 | { |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | foreach ($columns as $key => $column) { |
53 | 53 | $column_contents = $this->{$column}; |
54 | 54 | |
55 | - if (! is_object($this->{$column})) { |
|
55 | + if (!is_object($this->{$column})) { |
|
56 | 56 | $column_contents = json_decode($this->{$column}); |
57 | 57 | } |
58 | 58 | |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | { |
76 | 76 | $model = '\\'.get_class($this); |
77 | 77 | |
78 | - if (! count($columns)) { |
|
78 | + if (!count($columns)) { |
|
79 | 79 | if (property_exists($model, 'fakeColumns')) { |
80 | 80 | $columns = $this->fakeColumns; |
81 | 81 | } else { |
@@ -2,14 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace Backpack\CRUD\app\Http\Controllers; |
4 | 4 | |
5 | -use Backpack\CRUD\app\Http\Requests\CrudRequest as StoreRequest; |
|
6 | -use Backpack\CRUD\app\Http\Requests\CrudRequest as UpdateRequest; |
|
7 | 5 | use Backpack\CRUD\Crud; |
6 | +use Backpack\CRUD\app\Http\Requests\CrudRequest as UpdateRequest; |
|
8 | 7 | use Illuminate\Foundation\Bus\DispatchesJobs; |
9 | 8 | use Illuminate\Foundation\Validation\ValidatesRequests; |
10 | 9 | // VALIDATION: change the requests to match your own file names if you need form validation |
11 | 10 | use Illuminate\Routing\Controller as BaseController; |
12 | -use Illuminate\Support\Facades\Form as Form; |
|
13 | 11 | |
14 | 12 | class CrudController extends BaseController |
15 | 13 | { |
@@ -174,7 +174,7 @@ |
||
174 | 174 | { |
175 | 175 | $this->crud->hasAccessOrFail('reorder'); |
176 | 176 | |
177 | - if (! $this->crud->isReorderEnabled()) { |
|
177 | + if (!$this->crud->isReorderEnabled()) { |
|
178 | 178 | abort(403, 'Reorder is disabled.'); |
179 | 179 | } |
180 | 180 |