Merge branch '206-impossible-to-update-my-password-2' into 'main'

Resolve "Impossible to update my password"

Closes #206

See merge request yaal/canaille!208

CHANGES.rst

@@ -5,6 +5,10 @@ Added
 ^^^^^
 - ``--version`` option to the CLI. :pr:`209`
 
+Changed
+^^^^^^^
+- fixed a bug on updating user's settings :issue:`206`
+
 [0.0.57] - 2024-12-31
 ---------------------
 

canaille/core/endpoints/account.py

@@ -784,7 +784,7 @@ def profile_settings_edit(editor, edited_user):
         if hasattr(edited_user, k) and k in available_fields
     }
 
-    data["groups"] = [group.id for group in edited_user.groups]
+    data["groups"] = edited_user.groups
 
     form = build_profile_form(
         editor.writable_fields & available_fields,

canaille/core/endpoints/forms.py

@@ -260,10 +260,13 @@ PROFILE_FORM_FIELDS = dict(
     groups=wtforms.SelectMultipleField(
         _("Groups"),
         default=[],
-        choices=lambda: [
+        choices=lambda: sorted(
-            (group, group.display_name)
+            [
-            for group in Backend.instance.query(models.Group)
+                (group, group.display_name)
-        ],
+                for group in Backend.instance.query(models.Group)
+            ],
+            key=lambda group: group[0].id,
+        ),
         render_kw={"placeholder": _("users, admins …")},
         coerce=IDToModel("Group"),
         validators=[non_empty_groups],