Merge pull request #5 from thiagoprz/dev

Fix for trashed queries
thiagoprz · Sep 8, 2022 · 3a75e97 · 3a75e97
2 parents 587b3dc + 23af74b
commit 3a75e97
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Models/ModelCrud.php b/src/Models/ModelCrud.php
@@ -104,8 +104,8 @@ public static function search(array $data)
          * @see ModelCrud::$withTrashedForbidden
          */
         if (in_array(SoftDeletes::class, class_uses(self::class), true)) {
-            self::applyOnlyTrashed($query);
-            self::applyWithTrashed($query);
+            self::applyOnlyTrashed($query, $data);
+            self::applyWithTrashed($query, $data);
         }
 
         $result = !empty($data['no_pagination']) && !isset(self::$noPaginationForbidden) ? $query->get() : self::setSearchPagination($query);
@@ -185,7 +185,7 @@ public static function setSearchPagination($query)
      */
     public static function applyWithTrashed($query, array $data)
     {
-        if (!self::$withTrashedForbidden && $data['with_trashed']) {
+        if (!self::$withTrashedForbidden && !empty($data['with_trashed'])) {
             $query->withTrashed();
         }
     }
@@ -198,7 +198,7 @@ public static function applyWithTrashed($query, array $data)
      */
     public static function applyOnlyTrashed($query, array $data)
     {
-        if (!self::$onlyTrashedForbidden && $data['only_trashed']) {
+        if (!self::$onlyTrashedForbidden && !empty($data['only_trashed'])) {
             $query->onlyTrashed();
         }
     }