We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -224,10 +224,10 @@ |
||
224 | 224 | // add the details_row button to the first column |
225 | 225 | if ($this->getOperationSetting('detailsRow')) { |
226 | 226 | $details_row_button = \View::make('crud::columns.inc.details_row_button') |
227 | - ->with('crud', $this) |
|
228 | - ->with('entry', $entry) |
|
229 | - ->with('row_number', $rowNumber) |
|
230 | - ->render(); |
|
227 | + ->with('crud', $this) |
|
228 | + ->with('entry', $entry) |
|
229 | + ->with('row_number', $rowNumber) |
|
230 | + ->render(); |
|
231 | 231 | $row_items[0] = $details_row_button.$row_items[0]; |
232 | 232 | } |
233 | 233 |
@@ -33,35 +33,35 @@ |
||
33 | 33 | $old_primary_dependency = old_empty_or_null($primary_dependency['name'], false) ?? false; |
34 | 34 | $old_secondary_dependency = old_empty_or_null($secondary_dependency['name'], false) ?? false; |
35 | 35 | |
36 | - //for update form, get initial state of the entity |
|
37 | - if (isset($id) && $id) { |
|
36 | + //for update form, get initial state of the entity |
|
37 | + if (isset($id) && $id) { |
|
38 | 38 | |
39 | 39 | //get entity with relations for primary dependency |
40 | - $entity_dependencies = $entity_model->with($primary_dependency['entity']) |
|
41 | - ->with($primary_dependency['entity'].'.'.$primary_dependency['entity_secondary']) |
|
42 | - ->find($id); |
|
40 | + $entity_dependencies = $entity_model->with($primary_dependency['entity']) |
|
41 | + ->with($primary_dependency['entity'].'.'.$primary_dependency['entity_secondary']) |
|
42 | + ->find($id); |
|
43 | 43 | |
44 | - $secondaries_from_primary = []; |
|
44 | + $secondaries_from_primary = []; |
|
45 | 45 | |
46 | - //convert relation in array |
|
47 | - $primary_array = $entity_dependencies->{$primary_dependency['entity']}->toArray(); |
|
46 | + //convert relation in array |
|
47 | + $primary_array = $entity_dependencies->{$primary_dependency['entity']}->toArray(); |
|
48 | 48 | |
49 | - $secondary_ids = []; |
|
50 | - //create secondary dependency from primary relation, used to check what checkbox must be checked from second checklist |
|
51 | - if ($old_primary_dependency) { |
|
52 | - foreach ($old_primary_dependency as $primary_item) { |
|
53 | - foreach ($dependencyArray[$primary_item] as $second_item) { |
|
54 | - $secondary_ids[$second_item] = $second_item; |
|
55 | - } |
|
56 | - } |
|
57 | - } else { //create dependencies from relation if not from validate error |
|
58 | - foreach ($primary_array as $primary_item) { |
|
59 | - foreach ($primary_item[$secondary_dependency['entity']] as $second_item) { |
|
60 | - $secondary_ids[$second_item['id']] = $second_item['id']; |
|
61 | - } |
|
62 | - } |
|
63 | - } |
|
64 | - } |
|
49 | + $secondary_ids = []; |
|
50 | + //create secondary dependency from primary relation, used to check what checkbox must be checked from second checklist |
|
51 | + if ($old_primary_dependency) { |
|
52 | + foreach ($old_primary_dependency as $primary_item) { |
|
53 | + foreach ($dependencyArray[$primary_item] as $second_item) { |
|
54 | + $secondary_ids[$second_item] = $second_item; |
|
55 | + } |
|
56 | + } |
|
57 | + } else { //create dependencies from relation if not from validate error |
|
58 | + foreach ($primary_array as $primary_item) { |
|
59 | + foreach ($primary_item[$secondary_dependency['entity']] as $second_item) { |
|
60 | + $secondary_ids[$second_item['id']] = $second_item['id']; |
|
61 | + } |
|
62 | + } |
|
63 | + } |
|
64 | + } |
|
65 | 65 | |
66 | 66 | //json encode of dependency matrix |
67 | 67 | $dependencyJson = json_encode($dependencyArray); |
@@ -25,8 +25,8 @@ |
||
25 | 25 | } catch (\Throwable $e) { |
26 | 26 | } |
27 | 27 | $this->assertEquals( |
28 | - new \Symfony\Component\HttpKernel\Exception\HttpException(500, 'Cannot register \'setModel\' macro. \'setModel()\' already exists on Backpack\CRUD\app\Library\CrudPanel\CrudPanel'), |
|
29 | - $e |
|
30 | - ); |
|
28 | + new \Symfony\Component\HttpKernel\Exception\HttpException(500, 'Cannot register \'setModel\' macro. \'setModel()\' already exists on Backpack\CRUD\app\Library\CrudPanel\CrudPanel'), |
|
29 | + $e |
|
30 | + ); |
|
31 | 31 | } |
32 | 32 | } |