diff --git a/rhodecode/controllers/admin/users_groups.py b/rhodecode/controllers/admin/users_groups.py --- a/rhodecode/controllers/admin/users_groups.py +++ b/rhodecode/controllers/admin/users_groups.py @@ -130,11 +130,13 @@ class UsersGroupsController(BaseControll c.users_group.permissions['repositories_groups'][gr.group.group_name] \ = gr.permission.permission_name - c.group_members_obj = [x.user for x in c.users_group.members] + c.group_members_obj = sorted((x.user for x in c.users_group.members), + key=lambda u: u.username.lower()) c.group_members = [(x.user_id, x.username) for x in c.group_members_obj] - c.available_members = [(x.user_id, x.username) for x in - User.query().all()] + c.available_members = sorted(((x.user_id, x.username) for x in + User.query().all()), + key=lambda u: u[1].lower()) def update(self, id): """PUT /users_groups/id: Update an existing item""" diff --git a/rhodecode/templates/admin/users_groups/users_group_edit.html b/rhodecode/templates/admin/users_groups/users_group_edit.html --- a/rhodecode/templates/admin/users_groups/users_group_edit.html +++ b/rhodecode/templates/admin/users_groups/users_group_edit.html @@ -57,7 +57,7 @@
${_('Chosen group members')}
${h.select('users_group_members',[x[0] for x in c.group_members],c.group_members,multiple=True,size=8,style="min-width:210px")} -
+
${_('Remove all elements')} remove
@@ -87,7 +87,7 @@
- ${h.submit('save',_('save'),class_="ui-btn large")} + ${h.submit('Save',_('save'),class_="ui-btn large")}