Fix sort names getting mangled

CHANGELOG.md

@@ -30,7 +30,7 @@
   * added a new sort_name field that gets automatically created
 * automatically fill certain values in forms:
   * new game: name and sort name after typing
-  * new edition: name and sort name when selecting game
+  * new edition: name, sort name, and year when selecting game
   * new purchase: platform when selecting edition
 
 ## 1.3.0 / 2023-11-05 15:09+01:00

games/forms.py

@@ -80,6 +80,7 @@ class IncludeNameSelect(forms.Select):
         option = super().create_option(name, value, *args, **kwargs)
         if value:
             option["attrs"]["data-name"] = value.instance.name
+            option["attrs"]["data-year"] = value.instance.year_released
         return option
 
 

games/models.py

@@ -18,20 +18,17 @@ class Game(models.Model):
         return self.name
 
     def save(self, *args, **kwargs):
-        # Logic to create sort_name from name
         def get_sort_name(name):
             articles = ["a", "an", "the"]
             name_parts = name.split()
             first_word = name_parts[0].lower()
             if first_word in articles:
-                # Move the first word to the end
-                name_parts.append(name_parts.pop(0))
-                return ", ".join(name_parts).capitalize()
+                return f"{' '.join(name_parts[1:])}, {name_parts[0]}"
             else:
-                return name.capitalize()
+                return name
 
         self.sort_name = get_sort_name(self.name)
-        super().save(*args, **kwargs)  # Call the "real" save() method.
+        super().save(*args, **kwargs)
 
 
 class Edition(models.Model):
@@ -51,20 +48,17 @@ class Edition(models.Model):
         return self.sort_name
 
     def save(self, *args, **kwargs):
-        # Logic to create sort_name from name
         def get_sort_name(name):
             articles = ["a", "an", "the"]
             name_parts = name.split()
             first_word = name_parts[0].lower()
             if first_word in articles:
-                # Move the first word to the end
-                name_parts.append(name_parts.pop(0))
-                return ", ".join(name_parts).capitalize()
+                return f"{' '.join(name_parts[1:])}, {name_parts[0]}"
             else:
-                return name.capitalize()
+                return name
 
         self.sort_name = get_sort_name(self.name)
-        super().save(*args, **kwargs)  # Call the "real" save() method.
+        super().save(*args, **kwargs)
 
 
 class PurchaseQueryset(models.QuerySet):

games/static/js/add_edition.js

@@ -13,6 +13,12 @@ let syncData = [
     "target": "#id_sort_name",
     "target_value": "value"
   },
+  {
+    "source": "#id_game",
+    "source_value": "dataset.year",
+    "target": "#id_year_released",
+    "target_value": "value"
+  },  
 ]
 
 syncSelectInputUntilChanged(syncData, "form");