From 069748aa9106c1a2a583e4ab295157c7a33ad33b Mon Sep 17 00:00:00 2001 From: vdigital Date: Sat, 17 May 2008 20:40:27 +0000 Subject: Bug 703: Authorization system in Cat management works now with well ordered lists (Minor: Admin theme changes) git-svn-id: http://piwigo.org/svn/trunk@2349 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/cat_perm.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'admin/cat_perm.php') diff --git a/admin/cat_perm.php b/admin/cat_perm.php index e265430cf..45eb15937 100644 --- a/admin/cat_perm.php +++ b/admin/cat_perm.php @@ -231,12 +231,13 @@ SELECT group_id WHERE cat_id = '.$page['cat'].' ;'; $group_granted_ids = array_from_query($query, 'group_id'); +$group_granted_ids = order_by_name($group_granted_ids, $groups); $template->assign('group_granted_ids', $group_granted_ids); // groups denied $template->assign('group_denied_ids', - array_diff(array_keys($groups), $group_granted_ids) + order_by_name(array_diff(array_keys($groups), $group_granted_ids), $groups) ); // users... @@ -257,7 +258,7 @@ SELECT user_id WHERE cat_id = '.$page['cat'].' ;'; $user_granted_direct_ids = array_from_query($query, 'user_id'); - +$user_granted_direct_ids = order_by_name($user_granted_direct_ids, $users); $template->assign('user_granted_direct_ids', $user_granted_direct_ids); @@ -294,7 +295,8 @@ SELECT user_id, group_id $user_granted_indirect_ids = array_diff($user_granted_by_group_ids, $user_granted_direct_ids); - + $user_granted_indirect_ids = + order_by_name($user_granted_indirect_ids, $users); foreach ($user_granted_indirect_ids as $user_id) { foreach ($granted_groups as $group_id => $group_users) @@ -317,6 +319,7 @@ SELECT user_id, group_id $user_denied_ids = array_diff(array_keys($users), $user_granted_indirect_ids, $user_granted_direct_ids); +$user_denied_ids = order_by_name($user_denied_ids, $users); $template->assign('user_denied_ids', $user_denied_ids); -- cgit v1.2.3