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: { |
@@ -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 col-md-12 checklist_dependency" data-entity ="{{ $field['field_unique_name'] }}" @include('crud::inc.field_wrapper_attributes')> |
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,22 +40,22 @@ 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 | - //json encode of dependency matrix |
|
58 | - $dependencyJson = json_encode($dependencyArray); |
|
57 | + //json encode of dependency matrix |
|
58 | + $dependencyJson = json_encode($dependencyArray); |
|
59 | 59 | ?> |
60 | 60 | <script> |
61 | 61 | var {{ $field['field_unique_name'] }} = {!! $dependencyJson !!}; |
@@ -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 | { |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | public static function isColumnNullable($column_name) |
31 | 31 | { |
32 | 32 | $instance = new static(); // create an instance of the model to be able to get the table name |
33 | - return ! DB::connection()->getDoctrineColumn($instance->getTable(), $column_name)->getNotnull(); |
|
33 | + return !DB::connection()->getDoctrineColumn($instance->getTable(), $column_name)->getNotnull(); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | /* |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | foreach ($columns as $key => $column) { |
50 | 50 | $column_contents = $this->{$column}; |
51 | 51 | |
52 | - if (! is_object($this->{$column})) { |
|
52 | + if (!is_object($this->{$column})) { |
|
53 | 53 | $column_contents = json_decode($this->{$column}); |
54 | 54 | } |
55 | 55 | |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | { |
73 | 73 | $model = '\\'.get_class($this); |
74 | 74 | |
75 | - if (! count($columns)) { |
|
75 | + if (!count($columns)) { |
|
76 | 76 | $columns = (property_exists($model, 'fakeColumns')) ? $this->fakeColumns : ['extras']; |
77 | 77 | } |
78 | 78 | |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | $attribute_value = (array) $this->{$attribute_name}; |
163 | 163 | foreach ($files_to_clear as $key => $filename) { |
164 | 164 | \Storage::disk($disk)->delete($filename); |
165 | - $attribute_value = array_where($attribute_value, function ($value, $key) use ($filename) { |
|
165 | + $attribute_value = array_where($attribute_value, function($value, $key) use ($filename) { |
|
166 | 166 | return $value != $filename; |
167 | 167 | }); |
168 | 168 | } |
@@ -3,8 +3,8 @@ |
||
3 | 3 | namespace Backpack\CRUD; |
4 | 4 | |
5 | 5 | use DB; |
6 | -use Illuminate\Support\Facades\Config; |
|
7 | 6 | use Illuminate\Database\Eloquent\Model; |
7 | +use Illuminate\Support\Facades\Config; |
|
8 | 8 | |
9 | 9 | trait CrudTrait |
10 | 10 | { |
@@ -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 | ?> |
@@ -43,7 +43,7 @@ |
||
43 | 43 | |
44 | 44 | foreach ($fields as $k => $field) { |
45 | 45 | // set the value |
46 | - if (! isset($fields[$k]['value'])) { |
|
46 | + if (!isset($fields[$k]['value'])) { |
|
47 | 47 | if (isset($field['subfields'])) { |
48 | 48 | $fields[$k]['value'] = []; |
49 | 49 | foreach ($field['subfields'] as $key => $subfield) { |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | */ |
32 | 32 | public function hasAccess($permission) |
33 | 33 | { |
34 | - if (! in_array($permission, $this->access)) { |
|
34 | + if (!in_array($permission, $this->access)) { |
|
35 | 35 | return false; |
36 | 36 | } |
37 | 37 | |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | public function hasAccessToAll($permission_array) |
67 | 67 | { |
68 | 68 | foreach ($permission_array as $key => $permission) { |
69 | - if (! in_array($permission, $this->access)) { |
|
69 | + if (!in_array($permission, $this->access)) { |
|
70 | 70 | return false; |
71 | 71 | } |
72 | 72 | } |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | */ |
84 | 84 | public function hasAccessOrFail($permission) |
85 | 85 | { |
86 | - if (! in_array($permission, $this->access)) { |
|
86 | + if (!in_array($permission, $this->access)) { |
|
87 | 87 | abort(403, trans('backpack::crud.unauthorized_access')); |
88 | 88 | } |
89 | 89 | } |
@@ -29,20 +29,20 @@ |
||
29 | 29 | if (isset($fields[$k]['fake']) && $fields[$k]['fake'] == true) { |
30 | 30 | // add it to the request in its appropriate variable - the one defined, if defined |
31 | 31 | if (isset($fields[$k]['store_in'])) { |
32 | - if (! in_array($fields[$k]['store_in'], $fake_field_columns_to_encode, true)) { |
|
32 | + if (!in_array($fields[$k]['store_in'], $fake_field_columns_to_encode, true)) { |
|
33 | 33 | array_push($fake_field_columns_to_encode, $fields[$k]['store_in']); |
34 | 34 | } |
35 | 35 | } else { |
36 | 36 | //otherwise in the one defined in the $crud variable |
37 | 37 | |
38 | - if (! in_array('extras', $fake_field_columns_to_encode, true)) { |
|
38 | + if (!in_array('extras', $fake_field_columns_to_encode, true)) { |
|
39 | 39 | array_push($fake_field_columns_to_encode, 'extras'); |
40 | 40 | } |
41 | 41 | } |
42 | 42 | } |
43 | 43 | } |
44 | 44 | |
45 | - if (! count($fake_field_columns_to_encode)) { |
|
45 | + if (!count($fake_field_columns_to_encode)) { |
|
46 | 46 | return ['extras']; |
47 | 47 | } |
48 | 48 |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | // remove the fake field |
42 | 42 | array_pull($request, $fields[$k]['name']); |
43 | 43 | |
44 | - if (! in_array($fields[$k]['store_in'], $fake_field_columns_to_encode, true)) { |
|
44 | + if (!in_array($fields[$k]['store_in'], $fake_field_columns_to_encode, true)) { |
|
45 | 45 | array_push($fake_field_columns_to_encode, $fields[$k]['store_in']); |
46 | 46 | } |
47 | 47 | } else { |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | // remove the fake field |
53 | 53 | array_pull($request, $fields[$k]['name']); |
54 | 54 | |
55 | - if (! in_array('extras', $fake_field_columns_to_encode, true)) { |
|
55 | + if (!in_array('extras', $fake_field_columns_to_encode, true)) { |
|
56 | 56 | array_push($fake_field_columns_to_encode, 'extras'); |
57 | 57 | } |
58 | 58 | } |
@@ -1,10 +1,10 @@ |
||
1 | 1 | {{-- checkbox with loose false/null/0 checking --}} |
2 | 2 | <?php |
3 | - $icon = "fa-check-square-o"; |
|
4 | - if (strip_tags($entry->{$column['name']}) == false) |
|
5 | - { |
|
6 | - $icon = "fa-square-o"; |
|
7 | - } |
|
3 | + $icon = "fa-check-square-o"; |
|
4 | + if (strip_tags($entry->{$column['name']}) == false) |
|
5 | + { |
|
6 | + $icon = "fa-square-o"; |
|
7 | + } |
|
8 | 8 | ?> |
9 | 9 | |
10 | 10 | <td> |