Mercurial > kallithea
changeset 3624:4dddb7ee8865 beta
user group: sort lists of current and available members by username
It was hard to navigate lists with 200 users in "random" (user_id?) order.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 28 Mar 2013 01:10:45 +0100 |
| parents | ce9a226e0867 |
| children | 260a7a01b054 |
| files | rhodecode/controllers/admin/users_groups.py rhodecode/templates/admin/users_groups/users_group_edit.html |
| diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/users_groups.py Thu Mar 28 01:10:45 2013 +0100 +++ b/rhodecode/controllers/admin/users_groups.py Thu Mar 28 01:10:45 2013 +0100 @@ -130,11 +130,13 @@ 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"""
--- a/rhodecode/templates/admin/users_groups/users_group_edit.html Thu Mar 28 01:10:45 2013 +0100 +++ b/rhodecode/templates/admin/users_groups/users_group_edit.html Thu Mar 28 01:10:45 2013 +0100 @@ -57,7 +57,7 @@ <div style="float:left"> <div class="text" style="padding: 0px 0px 6px;">${_('Chosen group members')}</div> ${h.select('users_group_members',[x[0] for x in c.group_members],c.group_members,multiple=True,size=8,style="min-width:210px")} - <div id="remove_all_elements" style="cursor:pointer;text-align:center"> + <div id="remove_all_elements" style="cursor:pointer;text-align:center"> ${_('Remove all elements')} <img alt="remove" style="vertical-align:text-bottom" src="${h.url('/images/icons/arrow_right.png')}"/> </div> @@ -87,7 +87,7 @@ </div> <div class="buttons"> - ${h.submit('save',_('save'),class_="ui-btn large")} + ${h.submit('Save',_('save'),class_="ui-btn large")} </div> </div> </div>