X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FElements%2FRT__User%2FColumnMap;h=408d313ff863ccd2c5939141bf7b61f45815f0e9;hb=44dd00a3ff974a17999e86e64488e996edc71e3c;hp=2d2dab7a997f2b742eb58e39eb8f26194a5e6c49;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git

diff --git a/rt/share/html/Elements/RT__User/ColumnMap b/rt/share/html/Elements/RT__User/ColumnMap
index 2d2dab7a9..408d313ff 100644
--- a/rt/share/html/Elements/RT__User/ColumnMap
+++ b/rt/share/html/Elements/RT__User/ColumnMap
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -48,94 +48,108 @@
 <%ARGS>
 $Name
 $Attr => undef
+$GenericMap => {}
 </%ARGS>
 <%ONCE>
 my $COLUMN_MAP = {
-    id => {
-        title     => '#', # loc
-        attribute => 'id',
-        align     => 'right',
-        value     => sub { return $_[0]->id },
-    },
     Name => {
         title     => 'Name', # loc
-	attribute => 'Name',
-	value     => sub { return $_[0]->Name() },
+        attribute => 'Name',
+        value     => sub { return $_[0]->Name() },
     },
     RealName => {
-        title     => 'RealName', # loc
-	attribute => 'RealName',
-	value     => sub { return $_[0]->RealName() },
+        title     => 'Real Name', # loc
+        attribute => 'RealName',
+        value     => sub { return $_[0]->RealName() },
     },
     NickName => {
-        title     => 'NickName', # loc
-	attribute => 'NickName',
-	value     => sub { return $_[0]->NickName() },
+        title     => 'Nickname', # loc
+        attribute => 'NickName',
+        value     => sub { return $_[0]->NickName() },
     },
     EmailAddress => {
-        title     => 'EmailAddress', # loc
-	attribute => 'EmailAddress',
-	value     => sub { return $_[0]->EmailAddress() },
+        title     => 'Email Address', # loc
+        attribute => 'EmailAddress',
+        value     => sub { return $_[0]->EmailAddress() },
     },
     Organization => {
         title     => 'Organization', # loc
-	attribute => 'Organization',
-	value     => sub { return $_[0]->Organization() },
+        attribute => 'Organization',
+        value     => sub { return $_[0]->Organization() },
     },
     HomePhone => {
-        title     => 'HomePhone', # loc
-	attribute => 'HomePhone',
-	value     => sub { return $_[0]->HomePhone() },
+        title     => 'Home Phone', # loc
+        attribute => 'HomePhone',
+        value     => sub { return $_[0]->HomePhone() },
     },
     WorkPhone => {
-        title     => 'WorkPhone', # loc
-	attribute => 'WorkPhone',
-	value     => sub { return $_[0]->WorkPhone() },
+        title     => 'Work Phone', # loc
+        attribute => 'WorkPhone',
+        value     => sub { return $_[0]->WorkPhone() },
     },
     MobilePhone => {
-        title     => 'MobilePhone', # loc
-	attribute => 'MobilePhone',
-	value     => sub { return $_[0]->MobilePhone() },
+        title     => 'Mobile Phone', # loc
+        attribute => 'MobilePhone',
+        value     => sub { return $_[0]->MobilePhone() },
     },
     PagerPhone => {
-        title     => 'PagerPhone', # loc
-	attribute => 'PagerPhone',
-	value     => sub { return $_[0]->PagerPhone() },
+        title     => 'Pager Phone', # loc
+        attribute => 'PagerPhone',
+        value     => sub { return $_[0]->PagerPhone() },
     },
     Address1 => {
-        title     => 'Address1', # loc
-	attribute => 'Address1',
-	value     => sub { return $_[0]->Address1() },
+        title     => 'Address', # loc
+        attribute => 'Address1',
+        value     => sub { return $_[0]->Address1() },
     },
     Address2 => {
-        title     => 'Address2', # loc
-	attribute => 'Address2',
-	value     => sub { return $_[0]->Address2() },
+        title     => 'Address 2', # loc
+        attribute => 'Address2',
+        value     => sub { return $_[0]->Address2() },
     },
     City => {
         title     => 'City', # loc
-	attribute => 'City',
-	value     => sub { return $_[0]->City() },
+        attribute => 'City',
+        value     => sub { return $_[0]->City() },
     },
     State => {
         title     => 'State', # loc
-	attribute => 'State',
-	value     => sub { return $_[0]->State() },
+        attribute => 'State',
+        value     => sub { return $_[0]->State() },
     },
     Zip => {
         title     => 'Zip', # loc
-	attribute => 'Zip',
-	value     => sub { return $_[0]->Zip() },
+        attribute => 'Zip',
+        value     => sub { return $_[0]->Zip() },
     },
     Country => {
         title     => 'Country', # loc
-	attribute => 'Country',
-	value     => sub { return $_[0]->Country() },
+        attribute => 'Country',
+        value     => sub { return $_[0]->Country() },
+    },
+    Gecos => {
+        title       => 'Unix login', #loc
+        attribute   => 'Gecos',
+        value       => sub { return $_[0]->Gecos() },
+    },
+    Lang => {
+        title       => 'Language', #loc
+        attribute   => 'Lang',
+        value       => sub { return $_[0]->Lang() },
+    },
+    FreeformContactInfo => {
+        title       => 'Extra Info', #loc
+        attribute   => 'FreeformContactInfo',
+        value       => sub { return $_[0]->FreeformContactInfo() },
+    },
+    Disabled => {
+        title     => 'Status', # loc
+        value     => sub { return $_[0]->Disabled? $_[0]->loc('Disabled'): $_[0]->loc('Enabled') },
     },
 };
 
 </%ONCE>
 <%INIT>
-$m->callback( COLUMN_MAP => $COLUMN_MAP, CallbackName => 'ColumnMap', CallbackOnce => 1 );
+$m->callback( GenericMap => $GenericMap, COLUMN_MAP => $COLUMN_MAP, CallbackName => 'ColumnMap', CallbackOnce => 1 );
 return GetColumnMapEntry( Map => $COLUMN_MAP, Name => $Name, Attribute => $Attr );
 </%INIT>