diff --git a/app/Http/Controllers/FrontController.php b/app/Http/Controllers/FrontController.php index f0fecb3..9e0e955 100644 --- a/app/Http/Controllers/FrontController.php +++ b/app/Http/Controllers/FrontController.php @@ -64,17 +64,12 @@ class FrontController extends Controller } function dataset() { $data = []; - $dataset = Dataset::orderBy('DatasetId','DESC'); + if(@request()->key){ - $dataset->where('name','ilike','%'.request()->key.'%'); + $data['dataset'] = Dataset::where('name','ilike','%'.request()->key.'%')->orderBy('DatasetId','DESC')->paginate(10); + }else{ + $data['dataset'] = Dataset::orderBy('DatasetId','DESC')->paginate(10); } - if(@request()->resource){ - $dataset->where('template_id',decode_id(@request()->resource)); - } - - $dataset->paginate(10); - - $data['dataset'] = @$dataset; $data['template'] = Template::simplePaginate(12); $data['instansi'] = Instansi::all();