@@ -63,7 +63,7 @@ |
||
| 63 | 63 | // With conditions |
| 64 | 64 | if ($request->input('with_conditions') === '1') { |
| 65 | 65 | // TODO: Build $conditions['search'] earlier in the export process to match filter format... |
| 66 | - $conditions = ['search' => json_decode($request->input('conditions'))]; |
|
| 66 | + $conditions = [ 'search' => json_decode($request->input('conditions')) ]; |
|
| 67 | 67 | $export = $export->withConditions($conditions); |
| 68 | 68 | } |
| 69 | 69 | |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | */ |
| 26 | 26 | public function down() |
| 27 | 27 | { |
| 28 | - Schema::table($this->tablePrefix . 'filters', function (Blueprint $table) { |
|
| 28 | + Schema::table($this->tablePrefix.'filters', function(Blueprint $table) { |
|
| 29 | 29 | $table->renameColumn('order', 'order_by'); |
| 30 | 30 | }); |
| 31 | 31 | } |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <div class="autoscroll-x"> |
| 2 | - <?php $filterOrder = !empty($selectedFilter) ? (array) $selectedFilter->order : []; ?> |
|
| 2 | + <?php $filterOrder = !empty($selectedFilter) ? (array)$selectedFilter->order : [ ]; ?> |
|
| 3 | 3 | <table |
| 4 | 4 | id="{{ $datatableId }}" |
| 5 | 5 | class="striped highlight" |
@@ -31,15 +31,15 @@ discard block |
||
| 31 | 31 | <div class="search hide-on-small-only hide-on-med-only"> |
| 32 | 32 | <?php |
| 33 | 33 | $searchValue = null; |
| 34 | - if (!empty($selectedFilter) && !empty($selectedFilter->conditions->search->{$column['name']})) { |
|
| 35 | - $searchValue = $selectedFilter->conditions->search->{$column['name']}; |
|
| 34 | + if (!empty($selectedFilter) && !empty($selectedFilter->conditions->search->{$column[ 'name' ]})) { |
|
| 35 | + $searchValue = $selectedFilter->conditions->search->{$column[ 'name' ]}; |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | // If a special template exists, use it. Else use the generic template |
| 39 | 39 | $uitypeViewName = sprintf('uitypes.search.%s', $column[ 'uitype' ]); |
| 40 | 40 | $uitypeFallbackView = 'uccello::modules.default.uitypes.search.text'; |
| 41 | 41 | $uitypeViewToInclude = uccello()->view($column[ 'package' ], $module, $uitypeViewName, $uitypeFallbackView); |
| 42 | - $field = $module->fields()->where('name', $column['name'])->first(); |
|
| 42 | + $field = $module->fields()->where('name', $column[ 'name' ])->first(); |
|
| 43 | 43 | ?> |
| 44 | 44 | @include($uitypeViewToInclude, [ 'field' => $field ]) |
| 45 | 45 | </div> |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | { |
| 34 | 34 | // Related field |
| 35 | 35 | $relatedField = $relatedList->relatedField; |
| 36 | - $filter = ['order' => request('order')]; |
|
| 36 | + $filter = [ 'order' => request('order') ]; |
|
| 37 | 37 | |
| 38 | 38 | $query = $query->where($relatedField->column, $recordId) |
| 39 | 39 | ->filterBy($filter); |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | $relationName = $relatedList->relationName; |
| 75 | 75 | |
| 76 | 76 | $record = $modelClass::find($recordId); |
| 77 | - $filter = ['order' => request('order')]; |
|
| 77 | + $filter = [ 'order' => request('order') ]; |
|
| 78 | 78 | |
| 79 | 79 | $query = $record->$relationName() |
| 80 | 80 | ->filterBy($filter); |