Merge branch 'main' into develop

owlchester · Jul 15, 2024 · b6b2c6f · b6b2c6f
2 parents 98a1a19 + 9e8bd34
commit b6b2c6f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/app/Models/Character.php b/app/Models/Character.php
@@ -189,12 +189,11 @@ public function scopeMember(Builder $query, string|null $value, FilterOption $fi
             if (auth()->guest() || !auth()->user()->isAdmin()) {
                 $query->where('memb.is_private', 0);
             }
-
             return $query;
         } elseif ($filter === FilterOption::EXCLUDE) {
             return $query
                 ->whereRaw('(select count(*) from organisation_member as memb where memb.character_id = ' .
-                    $this->getTable() . '.id and memb.character_id = ' . ((int) $value) . ' and ' . $this->subPrivacy('memb.is_private') . ') = 0');
+                    $this->getTable() . '.id and memb.character_id = ' . ((int) $value) . ' ' . $this->subPrivacy('and memb.is_private') . ') = 0');
         }
 
         $ids = [$value];

diff --git a/app/Models/Concerns/HasFilters.php b/app/Models/Concerns/HasFilters.php
@@ -528,7 +528,7 @@ protected function filterFamily(Builder $query, string $value = null): void
         if ($this->filterOption('exclude')) {
             $query->whereRaw('(select count(*) from character_family as cf where cf.character_id = ' .
                 $this->getTable() . '.id and cf.family_id = ' . ((int) $value)
-                . ' and ' . $this->subPrivacy('cf.is_private') . ') = 0');
+                . ' ' . $this->subPrivacy('and cf.is_private') . ') = 0');
             return;
 
         } elseif ($this->filterOption('children')) {
@@ -704,6 +704,6 @@ protected function subPrivacy(string $field): string|null
             return null;
         }
 
-        return $field . ' = 0';
+        return ' ' . $field . ' = 0';
     }
 }
diff --git a/app/Models/Family.php b/app/Models/Family.php
@@ -161,7 +161,7 @@ public function scopeMember(Builder $query, string|null $value, FilterOption $fi
         } elseif ($filter === FilterOption::EXCLUDE) {
             return $query
                 ->whereRaw('(select count(*) from character_family as memb where memb.family_id = ' .
-                    $this->getTable() . '.id and memb.family_id = ' . ((int) $value) . ' and ' . $this->subPrivacy('memb.is_private') . ') = 0');
+                    $this->getTable() . '.id and memb.family_id = ' . ((int) $value) . ' ' . $this->subPrivacy('and memb.is_private') . ') = 0');
         }
 
         $ids = [$value];

diff --git a/app/Models/Organisation.php b/app/Models/Organisation.php
@@ -183,7 +183,7 @@ public function scopeMember(Builder $query, string|null $value, FilterOption $fi
         } elseif ($filter === FilterOption::EXCLUDE) {
             return $query
                 ->whereRaw('(select count(*) from organisation_member as memb where memb.organisation_id = ' .
-                    $this->getTable() . '.id and memb.character_id = ' . ((int) $value) . ' and ' . $this->subPrivacy('memb.is_private') . ') = 0');
+                    $this->getTable() . '.id and memb.character_id = ' . ((int) $value) . ' ' . $this->subPrivacy('and memb.is_private') . ') = 0');
         }
         $ids = [$value];