Fix slug issue

area17 · Jun 18, 2024 · 6d5c1ba · 6d5c1ba
1 parent f1041d1
commit 6d5c1ba
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/src/Models/Behaviors/HasSlug.php b/src/Models/Behaviors/HasSlug.php
@@ -6,6 +6,7 @@
 use A17\Twill\Models\Model;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 
 trait HasSlug
@@ -109,13 +110,7 @@ public function restoreSlugs(): void
      */
     public function handleSlugsOnSave(): void
     {
-        if ($this->twillSlugData === []) {
-            return;
-        }
-
-        foreach (getLocales() as $locale) {
-            $this->disableLocaleSlugs($locale);
-        }
+        $this->disableLocaleSlugs();
 
         $slugParams = $this->twillSlugData !== [] ? $this->twillSlugData : $this->getSlugParams();
 
@@ -208,12 +203,14 @@ protected function addOneSlug(array $slugParams): void
         $this->disableLocaleSlugs($slugParams['locale'], $slugModel->getKey());
     }
 
-    public function disableLocaleSlugs(string $locale, int $except_slug_id = 0): void
+    public function disableLocaleSlugs(string|array $locale = null, int $except_slug_id = 0): void
     {
-        $this->getSlugModelClass()::where($this->getForeignKey(), $this->id)
-            ->where('id', '<>', $except_slug_id)
-            ->where('locale', $locale)
-            ->update(['active' => 0]);
+        $query = $this->getSlugModelClass()::where($this->getForeignKey(), $this->id)
+            ->where('id', '<>', $except_slug_id);
+        if ($locale !== null) {
+            $query->whereIn('locale', Arr::wrap($locale));
+        }
+        $query->update(['active' => 0]);
     }
 
     private function suffixSlugIfExisting(array $slugParams): string
@@ -345,7 +342,7 @@ public function getSlugParams(?string $locale = null): ?array
                 }
 
                 $slugParam = [
-                        'active' => $translation->active,
+                        'active' => $translation->active ?? true,
                         'slug' => $translation->$slugAttribute ?? $this->$slugAttribute,
                         'locale' => $translation->locale,
                     ] + $slugDependenciesAttributes;