jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix sorting

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2020-05-11 23:52:36 +02:00
parent 5841445e0d
commit a9807b99e2
4 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/DataTables/Botanic/VarietiesDataTable.php
View File

@@ -12,7 +12,7 @@ class VarietiesDataTable extends DataTable
public function query(Variety $model) public function query(Variety $model)
{ {
$model = $model::with('specie'); $model = $model::with('specie')->select(['botanic_varieties.*']);
return self::buildQuery($model); return self::buildQuery($model);
} }

2
app/Http/Controllers/Botanic/Admin/VarietyController.php
View File

@@ -9,6 +9,8 @@ use App\Repositories\Botanic\Varieties;
use App\Repositories\Botanic\Species; use App\Repositories\Botanic\Species;
use App\DataTables\Botanic\VarietiesDataTable; use App\DataTables\Botanic\VarietiesDataTable;
use App\Models\Shop\Variety;
class VarietyController extends Controller class VarietyController extends Controller
{ {
public function index(VarietiesDataTable $dataTable) public function index(VarietiesDataTable $dataTable)

28
resources/views/Botanic/Admin/Families/form.blade.php
View File

@@ -1,21 +1,37 @@
@include('boilerplate::load.tinymce')
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-8">
<div class="row">
<div class="col-6">
{{ Form::label('name', 'Nom') }} {{ Form::label('name', 'Nom') }}
@include('components.input', ['name' => 'name', 'value' => (isset($family['name'])) ? $family['name'] : null, 'required' => true]) @include('components.input', ['name' => 'name', 'value' => (isset($family['name'])) ? $family['name'] : null, 'required' => true])
</div>
<div class="col-6">
{{ Form::label('alias', 'Alias') }} {{ Form::label('alias', 'Alias') }}
@include('components.input', ['name' => 'alias', 'value' => (isset($family['alias'])) ? $family['alias'] : null, 'required' => true]) @include('components.input', ['name' => 'alias', 'value' => (isset($family['alias'])) ? $family['alias'] : null, 'required' => true])
</div>
</div>
{{ Form::label('latin', 'Nom latin') }} {{ Form::label('latin', 'Nom latin') }}
@include('components.input', ['name' => 'latin', 'value' => (isset($family['latin'])) ? $family['latin'] : null, 'required' => true]) @include('components.input', ['name' => 'latin', 'value' => (isset($family['latin'])) ? $family['latin'] : null, 'required' => true])
<div class="row">
<div class="col-12">
{{ Form::label('description', 'Description') }}
@include('components.textarea', ['name' => 'description', 'value' => isset($family['description']) ? $family['description'] : null, 'class' => 'editor', 'required' => true])
</div> </div>
</div> </div>
<div class="row">
<div class="col-md-8">
<div class="float-right mt-3">
@include('components.button-save')
</div>
</div> </div>
</div> </div>
@include('components.save')
@push('js')
<script>
$(function() {
$('.editor').tinymce({});
});
</script>
@endpush

4
resources/views/components/save.blade.php
View File

@@ -1,6 +1,6 @@
<div class="row pb-5"> <div class="row pt-3 pb-5">
<div class="col-12"> <div class="col-12">
<div class="text-center mt-3"> <div class="text-right mt-3">
@include('components.button-save') @include('components.button-save')
</div> </div>
</div> </div>