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 | } |
@@ -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 |
@@ -26,7 +26,7 @@ |
||
26 | 26 | <!-- Include jQuery, jQuery UI, elFinder (REQUIRED) --> |
27 | 27 | |
28 | 28 | <?php |
29 | - $mimeTypes = implode(',', array_map(function ($t) { |
|
29 | + $mimeTypes = implode(',', array_map(function($t) { |
|
30 | 30 | return "'".$t."'"; |
31 | 31 | }, explode(',', $type))); |
32 | 32 | ?> |