wip #3305 @0.5

diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index aaa8b02aeac35643bedab92e8e8c6b872aa582df..c1291e6b745dc4b430b7d4bb1d2b225bd5ac37a7 100644 (file)
--- 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 38db2219a95e50b4e37c80590a6a31bf14cb07bf..14bd671115459849d0b90175e70c07489ea96dc4 100644 (file)
--- 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) : [];
     }
-
-
 }