From 62d5881bd0bc8376860ec69ddc7187e58dcc4298 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Wed, 23 Feb 2011 12:16:16 +1300 Subject: [PATCH] Fix sort order of members listed in a group. Signed-off-by: Andrew McMillan --- inc/ui/principal-edit.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/inc/ui/principal-edit.php b/inc/ui/principal-edit.php index ee7756e7..5c8c72c4 100644 --- a/inc/ui/principal-edit.php +++ b/inc/ui/principal-edit.php @@ -475,7 +475,11 @@ function group_memberships_browser() { function group_row_editor() { global $c, $id, $editor, $can_write_principal; $grouprow = new Editor("Group Members", "group_member"); - $grouprow->SetLookup( 'member_id', 'SELECT principal_id, coalesce(displayname,fullname,username) FROM dav_principal WHERE principal_id NOT IN (SELECT member_id FROM group_member WHERE group_id = '.$id.') AND principal_id != '.$id); + $sql = 'SELECT principal_id, coalesce(displayname,fullname,username) FROM dav_principal '; + $sql .= 'WHERE principal_id NOT IN (SELECT member_id FROM group_member WHERE group_id = '.$id.') '; + $sql .= 'AND principal_id != '.$id; + $sql .= 'ORDER BY 2'; + $grouprow->SetLookup( 'member_id', $sql); $grouprow->SetSubmitName( 'savegrouprow' ); if ( $can_write_principal ) {