Fixed entity type filter bug in new search system

diff --git a/app/Services/SearchService.php b/app/Services/SearchService.php
index 8202b4997fd9f6c1dd4f3e97dadd1afed71a64d7..a2844c593f23e8c5966e393f275065b8d1937415 100644 (file)
--- a/app/Services/SearchService.php
+++ b/app/Services/SearchService.php
@@ -175,7 +175,7 @@ class SearchService
         // Split filter values out
         $splitFilters = [];
         foreach ($terms['filters'] as $filter) {
         // Split filter values out
         $splitFilters = [];
         foreach ($terms['filters'] as $filter) {

-            $explodedFilter = explode(':', $filter, 1);
+            $explodedFilter = explode(':', $filter, 2);

             $splitFilters[$explodedFilter[0]] = (count($explodedFilter) > 1) ? $explodedFilter[1] : '';
         }
         $terms['filters'] = $splitFilters;
             $splitFilters[$explodedFilter[0]] = (count($explodedFilter) > 1) ? $explodedFilter[1] : '';
         }
         $terms['filters'] = $splitFilters;

diff --git a/resources/assets/js/vues/search.js b/resources/assets/js/vues/search.js
index 1fcd690c45078bd40d0f1e198c84856e566499c6..708418271f3b9cdcceb45fbd8698cc798dfffe1d 100644 (file)
--- a/resources/assets/js/vues/search.js
+++ b/resources/assets/js/vues/search.js
@@ -53,6 +53,10 @@ let methods = {
             return;
         }
         this.appendTerm(typeTerm);
             return;
         }
         this.appendTerm(typeTerm);

+    },
+
+    updateSearch() {
+        window.location = '/search?term=' + encodeURIComponent(this.termString);

     }
 
 };
     }
 
 };

diff --git a/resources/views/search/all.blade.php b/resources/views/search/all.blade.php
index eb8ef51f3569d0952f2a3e25add84c2be3016300..ac5cd7db4ee0ab2b4a62802d795c1d7bc6308706 100644 (file)
--- a/resources/views/search/all.blade.php
+++ b/resources/views/search/all.blade.php
@@ -40,6 +40,9 @@
                     <label><input type="checkbox" v-on:change="typeChange" v-model="search.type.book" value="book"> Book</label>
                 </div>
 
                     <label><input type="checkbox" v-on:change="typeChange" v-model="search.type.book" value="book"> Book</label>
                 </div>
 

+
+                <button type="button" class="button pos" v-on:click="updateSearch">Update Search</button>
+

             </div>
 
         </div>
             </div>
 
         </div>


@@ -48,11 +51,4 @@
     </div>
 </div>
 
     </div>
 </div>
 

-@stop
-
-@section('scripts')
-    <script>
-
-
-    </script>

 @stop
\ No newline at end of file
 @stop
\ No newline at end of file