We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
| @@ -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 | |
| @@ -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 !!}; |