We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -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 | |
@@ -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 !!}; |
@@ -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 | { |
@@ -454,6 +456,7 @@ discard block |
||
| 454 | 456 | * All Create-Read-Update-Delete operations are done using that Eloquent Collection. |
| 455 | 457 | * |
| 456 | 458 | * @param [string] Full model namespace. Ex: App\Models\Article |
| 459 | + * @param string $model_namespace |
|
| 457 | 460 | */ |
| 458 | 461 | public function setModel($model_namespace) |
| 459 | 462 | { |
@@ -483,6 +486,7 @@ discard block |
||
| 483 | 486 | * |
| 484 | 487 | * @param [string] Route name. |
| 485 | 488 | * @param [array] Parameters. |
| 489 | + * @param string $route |
|
| 486 | 490 | */ |
| 487 | 491 | public function setRoute($route) |
| 488 | 492 | { |
@@ -530,6 +534,8 @@ discard block |
||
| 530 | 534 | * |
| 531 | 535 | * @param [string] Entity name, in singular. Ex: article |
| 532 | 536 | * @param [string] Entity name, in plural. Ex: articles |
| 537 | + * @param string $singular |
|
| 538 | + * @param string $plural |
|
| 533 | 539 | */ |
| 534 | 540 | public function setEntityNameStrings($singular, $plural) |
| 535 | 541 | { |
@@ -708,8 +714,6 @@ discard block |
||
| 708 | 714 | /** |
| 709 | 715 | * Add a field to the create/update form or both. |
| 710 | 716 | * |
| 711 | - * @param [string] $name Field name (the column name in the db in most cases) |
|
| 712 | - * @param [array] $options Field-type-specific information. |
|
| 713 | 717 | * @param string $form The form to add the field to (create/update/both) |
| 714 | 718 | */ |
| 715 | 719 | public function addField($field, $form = 'both') |
@@ -1260,6 +1264,9 @@ discard block |
||
| 1260 | 1264 | $this->setSort('fields', (array) $order); |
| 1261 | 1265 | } |
| 1262 | 1266 | |
| 1267 | + /** |
|
| 1268 | + * @param string $type |
|
| 1269 | + */ |
|
| 1263 | 1270 | public function sync($type, $fields, $attributes) |
| 1264 | 1271 | { |
| 1265 | 1272 | if (!empty($this->{$type})) { |
@@ -1273,11 +1280,17 @@ discard block |
||
| 1273 | 1280 | } |
| 1274 | 1281 | } |
| 1275 | 1282 | |
| 1283 | + /** |
|
| 1284 | + * @param string $items |
|
| 1285 | + */ |
|
| 1276 | 1286 | public function setSort($items, $order) |
| 1277 | 1287 | { |
| 1278 | 1288 | $this->sort[$items] = $order; |
| 1279 | 1289 | } |
| 1280 | 1290 | |
| 1291 | + /** |
|
| 1292 | + * @param string $items |
|
| 1293 | + */ |
|
| 1281 | 1294 | public function sort($items) |
| 1282 | 1295 | { |
| 1283 | 1296 | if (array_key_exists($items, $this->sort)) { |
@@ -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 | { |