We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -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 !!}; |
@@ -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 | { |
@@ -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> |
@@ -1,6 +1,6 @@ |
||
1 | 1 | {{-- custom return value via attribute --}} |
2 | 2 | <td> |
3 | 3 | <?php |
4 | - echo $entry->{$column['function_name']}()->{$column['attribute']}; |
|
4 | + echo $entry->{$column['function_name']}()->{$column['attribute']}; |
|
5 | 5 | ?> |
6 | 6 | </td> |
7 | 7 | \ No newline at end of file |
@@ -1,8 +1,8 @@ |
||
1 | 1 | {{-- single relationships (1-1, 1-n) --}} |
2 | 2 | <td> |
3 | 3 | <?php |
4 | - if ($entry->{$column['entity']}()->getResults()) { |
|
5 | - echo $entry->{$column['entity']}()->getResults()->{$column['attribute']}; |
|
6 | - } |
|
7 | - ?> |
|
4 | + if ($entry->{$column['entity']}()->getResults()) { |
|
5 | + echo $entry->{$column['entity']}()->getResults()->{$column['attribute']}; |
|
6 | + } |
|
7 | + ?> |
|
8 | 8 | </td> |
9 | 9 | \ No newline at end of file |
@@ -1,6 +1,6 @@ |
||
1 | 1 | {{-- custom return value --}} |
2 | 2 | <td> |
3 | 3 | <?php |
4 | - echo $entry->{$column['function_name']}(); |
|
4 | + echo $entry->{$column['function_name']}(); |
|
5 | 5 | ?> |
6 | 6 | </td> |
7 | 7 | \ No newline at end of file |
@@ -1,12 +1,12 @@ |
||
1 | 1 | {{-- enumerate the values in an array --}} |
2 | 2 | <td> |
3 | 3 | <?php |
4 | - $value = $entry->{$column['name']}; |
|
4 | + $value = $entry->{$column['name']}; |
|
5 | 5 | |
6 | - // the value should be an array wether or not attribute casting is used |
|
7 | - if (!is_array($value)) { |
|
8 | - $value = json_decode($value, true); |
|
9 | - } |
|
6 | + // the value should be an array wether or not attribute casting is used |
|
7 | + if (!is_array($value)) { |
|
8 | + $value = json_decode($value, true); |
|
9 | + } |
|
10 | 10 | |
11 | 11 | if ($value && count($value)) { |
12 | 12 | echo implode(', ', $value); |
@@ -95,6 +95,12 @@ |
||
95 | 95 | public $type = 'view'; |
96 | 96 | public $content; |
97 | 97 | |
98 | + /** |
|
99 | + * @param string $stack |
|
100 | + * @param string $name |
|
101 | + * @param string $type |
|
102 | + * @param string $content |
|
103 | + */ |
|
98 | 104 | public function __construct($stack, $name, $type, $content) |
99 | 105 | { |
100 | 106 | $this->stack = $stack; |
@@ -87,23 +87,23 @@ |
||
87 | 87 | Route::post($name.'/search', [ |
88 | 88 | 'as' => 'crud.'.$name.'.search', |
89 | 89 | 'uses' => $controller.'@search' |
90 | - ]); |
|
90 | + ]); |
|
91 | 91 | Route::get($name.'/reorder', [ |
92 | 92 | 'as' => 'crud.'.$name.'.reorder', |
93 | 93 | 'uses' => $controller.'@reorder' |
94 | - ]); |
|
94 | + ]); |
|
95 | 95 | Route::post($name.'/reorder', [ |
96 | 96 | 'as' => 'crud.'.$name.'.save.reorder', |
97 | 97 | 'uses' => $controller.'@saveReorder' |
98 | - ]); |
|
98 | + ]); |
|
99 | 99 | Route::get($name.'/{id}/details', [ |
100 | 100 | 'as' => 'crud.'.$name.'.showDetailsRow', |
101 | 101 | 'uses' => $controller.'@showDetailsRow' |
102 | - ]); |
|
102 | + ]); |
|
103 | 103 | Route::get($name.'/{id}/translate/{lang}', [ |
104 | 104 | 'as' => 'crud.'.$name.'.translateItem', |
105 | 105 | 'uses' => $controller.'@translateItem' |
106 | - ]); |
|
106 | + ]); |
|
107 | 107 | |
108 | 108 | $options_with_default_route_names = array_merge([ |
109 | 109 | 'names' => [ |