fix: Fix non working filters

geokrety · Jun 18, 2024 · be5590e · be5590e
1 parent a3738ba
commit be5590e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/website/app/GeoKrety/Controller/Pages/BaseDatatableMoves.php b/website/app/GeoKrety/Controller/Pages/BaseDatatableMoves.php
@@ -17,6 +17,6 @@ protected function getObjectName(): string {
      * @return string[]
      */
     protected function getSearchable(): array {
-        return ['gkid', 'name'];
+        return ['gkid', 'comment', 'waypoint'];
     }
 }
diff --git a/website/app/GeoKrety/Controller/Pages/UserInventory.php b/website/app/GeoKrety/Controller/Pages/UserInventory.php
@@ -18,7 +18,15 @@ protected function getFilter(): array {
         return ['holder = ?', $this->user->id];
     }
 
+    protected function getHas(\GeoKrety\Model\Base $object): void {
+        $object->orHas('owner', ['0=1']); // Trick to create join on owner table
+    }
+
     protected function getTemplate(): string {
         return 'elements/geokrety_as_list_user_inventory.tpl';
     }
+
+    protected function getSearchable(): array {
+        return ['gkid', 'name', 'gk_users__owner.username'];
+    }
 }
diff --git a/website/app/GeoKrety/Controller/Pages/UserRecentMoves.php b/website/app/GeoKrety/Controller/Pages/UserRecentMoves.php
@@ -18,6 +18,14 @@ protected function getFilter(): array {
         return ['author = ?', $this->user->id];
     }
 
+    protected function getHas(\GeoKrety\Model\Base $object): void {
+        $object->orHas('geokret', ['0=1']); // Trick to create join on geokret table
+    }
+
+    protected function getSearchable(): array {
+        return ['gkid', 'comment', 'waypoint', 'gk_geokrety__geokret.name'];
+    }
+
     protected function getTemplate(): string {
         return 'elements/move_as_list.tpl';
     }