diff --git a/app/DataTables/Botanic/VarietiesDataTable.php b/app/DataTables/Botanic/VarietiesDataTable.php index 9406693f..501a377e 100644 --- a/app/DataTables/Botanic/VarietiesDataTable.php +++ b/app/DataTables/Botanic/VarietiesDataTable.php @@ -12,7 +12,7 @@ class VarietiesDataTable extends DataTable public function query(Variety $model) { - $model = $model::with('specie'); + $model = $model::with('specie')->select(['botanic_varieties.*']); return self::buildQuery($model); } diff --git a/app/Http/Controllers/Botanic/Admin/VarietyController.php b/app/Http/Controllers/Botanic/Admin/VarietyController.php index 56a1f39c..4b1f5dd7 100644 --- a/app/Http/Controllers/Botanic/Admin/VarietyController.php +++ b/app/Http/Controllers/Botanic/Admin/VarietyController.php @@ -9,6 +9,8 @@ use App\Repositories\Botanic\Varieties; use App\Repositories\Botanic\Species; use App\DataTables\Botanic\VarietiesDataTable; +use App\Models\Shop\Variety; + class VarietyController extends Controller { public function index(VarietiesDataTable $dataTable) diff --git a/resources/views/Botanic/Admin/Families/form.blade.php b/resources/views/Botanic/Admin/Families/form.blade.php index d3c61436..6710434e 100644 --- a/resources/views/Botanic/Admin/Families/form.blade.php +++ b/resources/views/Botanic/Admin/Families/form.blade.php @@ -1,21 +1,37 @@ +@include('boilerplate::load.tinymce') +