From: Vincent Vanwaelscappel Date: Fri, 3 Jan 2020 18:22:36 +0000 (+0100) Subject: wip #3305 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9b86b497c17d1c4b933e609584f9f7a27952763e;p=pmi.git wip #3305 @0.5 --- diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php index aaa8b02..c1291e6 100644 --- a/app/Http/Controllers/AjaxController.php +++ b/app/Http/Controllers/AjaxController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; +use App\Models\Locale; use App\Models\Page; use App\Models\Product; use App\Models\ProductType; @@ -235,7 +236,8 @@ class AjaxController extends CubistFrontController public function search(Request $request) { - return Search::query($request->q, $request->type ?? null, $request->limit ?? null); + return Search::query($request->q, Locale::getDefaultLocale(), $request->type ?? null, $request->limit ?? null); + } public function filtercatalog(Request $request) diff --git a/app/Templates/Search.php b/app/Templates/Search.php index 38db221..14bd671 100644 --- a/app/Templates/Search.php +++ b/app/Templates/Search.php @@ -3,6 +3,7 @@ namespace App\Templates; +use App\Models\Locale; use Cubist\Backpack\app\Magic\Search as SearchEngine; class Search extends Base @@ -22,23 +23,19 @@ class Search extends Base $this->removeField('intro'); - $this->addField(['name' => 'page_heading', - 'type' => 'Text', - 'label' => 'Titre de la page', - 'tab' => 'Contenus']); + $this->addField(['name' => 'page_heading', + 'type' => 'Text', + 'label' => 'Titre de la page', + 'tab' => 'Contenus']); } // Enable form $this->addForm(); } - public function setData(&$data) { - + public function setData(&$data) + { $request = $data['request']; - - $data['results'] = $request->q ? SearchEngine::query($request->q, $request->type, $request->limit) : []; - + $data['results'] = $request->q ? SearchEngine::query($request->q, Locale::getDefaultLocale(), $request->type, $request->limit) : []; } - - }