retrieve slug from slugs table if the $slugAttribute field was not ch…

…anged
area17 · Nov 1, 2024 · 954bc90 · 954bc90
1 parent 53f59c3
commit 954bc90
Showing 1 changed file with 23 additions and 4 deletions.
diff --git a/src/Models/Behaviors/HasSlug.php b/src/Models/Behaviors/HasSlug.php
@@ -124,10 +124,10 @@ public function restoreSlugs(): void
      */
     public function handleSlugsOnSave(): void
     {
-        $this->disableLocaleSlugs();
-
         $slugParams = $this->twillSlugData !== [] ? $this->twillSlugData : $this->getSlugParams();
 
+        $this->disableLocaleSlugs();
+
         foreach ($slugParams as $params) {
             if (in_array($params['locale'], config('twill.slug_utf8_languages', []))) {
                 $params['slug'] = $this->getUtf8Slug($params['slug']);
@@ -358,9 +358,13 @@ public function getSlugParams(?string $locale = null): ?array
                     throw new \Exception("You must define the field {$slugAttribute} in your model");
                 }
 
+                $slug = $this->getSlugValue($slugAttribute, $translation->locale)
+                    ?? $translation->$slugAttribute
+                    ?? $this->$slugAttribute;
+
                 $slugParam = [
                         'active' => $translation->active ?? true,
-                        'slug' => $translation->$slugAttribute ?? $this->$slugAttribute,
+                        'slug' => $slug,
                         'locale' => $translation->locale,
                     ] + $slugDependenciesAttributes;
 
@@ -400,7 +404,7 @@ public function getSingleSlugParams(?string $locale = null): ?array
 
                 $slugParam = [
                         'active' => 1,
-                        'slug' => $this->$slugAttribute,
+                        'slug' => $this->getSlugValue($slugAttribute, $appLocale) ?? $this->$slugAttribute,
                         'locale' => $appLocale,
                     ] + $slugDependenciesAttributes;
 
@@ -415,6 +419,21 @@ public function getSingleSlugParams(?string $locale = null): ?array
         return $locale === null ? $slugParams : null;
     }
 
+    /**
+     * Returns changed value of slugAttribute field or previous slug value
+     *
+     * @param $slugAttribute
+     * @param $locale
+     * @return mixed|null
+     */
+    private function getSlugValue($slugAttribute, $locale): mixed
+    {
+        return $this->wasChanged($slugAttribute)
+            ? $this->$slugAttribute
+            : $this->slugs()->where('locale', $locale)
+                ->where('active', true)->value('slug');
+    }
+
     /**
      * Returns the database table name for this model's slugs.
      */