uccellolabs / uccello

database/migrations/2018_04_15_000035_alter_filter_module.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
      */
     public function down()
     {
-        Schema::table($this->tablePrefix . 'filters', function (Blueprint $table) {
+        Schema::table($this->tablePrefix.'filters', function(Blueprint $table) {
             $table->renameColumn('order', 'order_by');
         });
     }

resources/views/modules/default/detail/relatedlists/table.blade.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <div class="autoscroll-x">
-    <?php $filterOrder = !empty($selectedFilter) ? (array) $selectedFilter->order : []; ?>
+    <?php $filterOrder = !empty($selectedFilter) ? (array)$selectedFilter->order : [ ]; ?>
     <table
         id="{{ $datatableId }}"
         class="striped highlight"
@@ -31,15 +31,15 @@ 
                     <div class="search hide-on-small-only hide-on-med-only">
                         <?php
                             $searchValue = null;
-                            if (!empty($selectedFilter) && !empty($selectedFilter->conditions->search->{$column['name']})) {
-                                $searchValue = $selectedFilter->conditions->search->{$column['name']};
+                            if (!empty($selectedFilter) && !empty($selectedFilter->conditions->search->{$column[ 'name' ]})) {
+                                $searchValue = $selectedFilter->conditions->search->{$column[ 'name' ]};
                             }
 
                             // If a special template exists, use it. Else use the generic template
                             $uitypeViewName = sprintf('uitypes.search.%s', $column[ 'uitype' ]);
                             $uitypeFallbackView = 'uccello::modules.default.uitypes.search.text';
                             $uitypeViewToInclude = uccello()->view($column[ 'package' ], $module, $uitypeViewName, $uitypeFallbackView);
-                            $field = $module->fields()->where('name', $column['name'])->first();
+                            $field = $module->fields()->where('name', $column[ 'name' ])->first();
                         ?>
                         @include($uitypeViewToInclude, [ 'field' => $field ])
                     </div>

app/Support/Traits/RelatedlistTrait.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
     {
         // Related field
         $relatedField = $relatedList->relatedField;
-        $filter = ['order' => request('order')];
+        $filter = [ 'order' => request('order') ];
 
         $query = $query->where($relatedField->column, $recordId)
                         ->filterBy($filter);
@@ -74,7 +74,7 @@ 
         $relationName = $relatedList->relationName;
 
         $record = $modelClass::find($recordId);
-        $filter = ['order' => request('order')];
+        $filter = [ 'order' => request('order') ];
 
         $query = $record->$relationName()
                         ->filterBy($filter);

app/Models/Filter.php

Spacing +7 added lines, -7 removed lines

@@ -78,24 +78,24 @@
             $filter = new static();
 
             // Refactor $data to mach match 'conditions' filter format...
-            if(!empty($data['columns']) && is_array($data['columns']) && is_array(reset($data['columns'])))
+            if (!empty($data[ 'columns' ]) && is_array($data[ 'columns' ]) && is_array(reset($data[ 'columns' ])))
             {
-                if (empty($data['conditions'])) {
-                    $data['conditions'] = [];
+                if (empty($data[ 'conditions' ])) {
+                    $data[ 'conditions' ] = [ ];
                 }
                 else {
-                    $data['conditions'] = (array) $data['conditions'];
+                    $data[ 'conditions' ] = (array)$data[ 'conditions' ];
                 }
 
-                foreach ($data['columns'] as $fieldName => $field) {
+                foreach ($data[ 'columns' ] as $fieldName => $field) {
                     foreach ($field as $key => $value) {
                         if (!empty($value) && $key != 'columnName') {
-                            $data['conditions'][$key][$fieldName] = $value;
+                            $data[ 'conditions' ][ $key ][ $fieldName ] = $value;
                         }
                     }
                 }
 
-                unset($data['columns']);
+                unset($data[ 'columns' ]);
             }
 
             foreach ($data as $key => $value) {