Changeset 2349 for trunk/admin/cat_perm.php

Timestamp:

May 17, 2008, 10:40:27 PM (16 years ago)

Author:

vdigital

Message:

Bug 703: Authorization system in Cat management works now with well ordered lists
(Minor: Admin theme changes)

File:

• trunk/admin/cat_perm.php (modified) (5 diffs)

trunk/admin/cat_perm.php

@@ -232 +232 @@
 ;';
 $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);
 
@@ -237 +238 @@
 // 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)
   );
 
@@ -258 +259 @@
 ;';
 $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);
 
@@ -295 +296 @@
   $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)
   {
@@ -318 +320 @@
                               $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);