show roles in user grid

diff --git a/ipf/auth/models/User.php b/ipf/auth/models/User.php
index 640a5d6ffb2f7a67b997907fcfe19d79a841c386..99b62e7bbfb243d37035f56295261e30f0c0b628 100644 (file)
--- a/ipf/auth/models/User.php
+++ b/ipf/auth/models/User.php
@@ -128,16 +128,29 @@ class AdminUser extends IPF_Admin_Model
 {
     public function list_display()
     {
-        return array(
+        $columns = array(
             'username',
             'email',
             'is_active',
             'is_staff',
             'is_superuser',
-            'created_at',
         );
+        if (IPF_Auth_App::ArePermissionsEnabled()) {
+            $columns[] = 'groups';
+        }
+        $columns[] = 'created_at';
+        return $columns;
     }
-    
+
+    public function column_groups($obj)
+    {
+        $roles = array();
+        foreach ($obj->Roles as $role) {
+            $roles[] = $role->name;
+        }
+        return implode(' / ', $roles);
+    }
+
     public function fields()
     {
         $fields = array(