[Rt-commit] rt branch, admin_ui, updated. 878c539ea4ccfd701ca5a1557f0f628690137611

[sunnavy at bestpractical.com]

The branch, admin_ui has been updated
       via  878c539ea4ccfd701ca5a1557f0f628690137611 (commit)
      from  9b971603365ee693b7b7011663e1620c19354ee3 (commit)

Summary of changes:
 lib/RT/View/Admin/Groups.pm |   10 +++++++++-
 lib/RT/View/Admin/Users.pm  |   21 +++++++++++++++------
 2 files changed, 24 insertions(+), 7 deletions(-)

- Log -----------------------------------------------------------------
commit 878c539ea4ccfd701ca5a1557f0f628690137611
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Jan 29 21:02:24 2010 +0800

    show cfs columns for Users and Groups

diff --git a/lib/RT/View/Admin/Groups.pm b/lib/RT/View/Admin/Groups.pm
index 965e38b..8e29a40 100644
--- a/lib/RT/View/Admin/Groups.pm
+++ b/lib/RT/View/Admin/Groups.pm
@@ -55,7 +55,15 @@ use base 'RT::View::CRUD';
 use constant page_title     => 'Group Management';
 use constant object_type    => 'Group';
 
-use constant display_columns => qw(id name description disabled);
+sub display_columns {
+    my $self = shift;
+    return qw(id name description disabled), $self->custom_field_columns( RT::Model::Group->new );
+}
+
+sub edit_columns {
+    my $self = shift;
+    return qw(id name description disabled), $self->custom_field_columns( RT::Model::Group->new );
+}
 
 sub _current_collection {
     my $self = shift;
diff --git a/lib/RT/View/Admin/Users.pm b/lib/RT/View/Admin/Users.pm
index e681f44..1bc2dc0 100644
--- a/lib/RT/View/Admin/Users.pm
+++ b/lib/RT/View/Admin/Users.pm
@@ -54,13 +54,22 @@ use base 'RT::View::CRUD';
 
 use constant page_title      => 'User Management';
 use constant object_type     => 'User';
-use constant display_columns => qw(id name real_name email privileged disabled);
 
-use constant edit_columns => qw(name email real_name nickname gecos lang
-  time_zone freeform_contact_info
-  organization address1 address2 city state zip country
-  home_phone work_phone mobile_phone pager_phone
-  password password_confirm comments signature privileged disabled);
+sub display_columns {
+    my $self = shift;
+    return qw(id name real_name email privileged disabled),
+      $self->custom_field_columns( RT::Model::User->new );
+}
+
+sub edit_columns {
+    my $self    = shift;
+    return qw(name email real_name nickname gecos lang
+      time_zone freeform_contact_info
+      organization address1 address2 city state zip country
+      home_phone work_phone mobile_phone pager_phone
+      password password_confirm comments signature privileged disabled),
+      $self->custom_field_columns( RT::Model::User->new );
+}
 
 # unused columns:
 #  email_encoding web_encoding external_contact_info_id

-----------------------------------------------------------------------