From 827b9d6a3d11df8bd8f98a901a66bb902be2127c Mon Sep 17 00:00:00 2001 From: Andrey Kutejko Date: Fri, 16 Aug 2013 07:16:08 +0300 Subject: [PATCH] show roles in user grid --- ipf/auth/models/User.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/ipf/auth/models/User.php b/ipf/auth/models/User.php index 640a5d6..99b62e7 100644 --- 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( -- 2.49.0