GREG-247: Make the org unit list sorted alphabetically in the admin interface

greg/admin.py

@@ -123,10 +123,13 @@ class IdentifierAdmin(VersionAdmin):
 
 
 class OrganizationalUnitAdmin(VersionAdmin):
-    list_display = ("id", "name_en", "parent")
+    list_display = ("id", "name_en", "name_nb", "parent")
     readonly_fields = ("id", "created", "updated")
-    search_fields = ("name_en", "id")
+    search_fields = ("name_en", "name_nb", "id")
     inlines = (OuIdentifierInline,)
+    # This is mainly to make the org unit list be sorted in the drop-down box
+    # in the role line under persons
+    ordering = ('name_nb',)
 
 
 class OrganizationalUnitInline(admin.TabularInline):

greg/models.py

@@ -521,7 +521,7 @@ class OrganizationalUnit(BaseModel):
         )
 
     def __str__(self) -> str:
-        return f"{self.name_en or self.name_nb}"
+        return f"{self.name_nb} ({self.name_en})"
 
     def fetch_tree(self):
         """