X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_hardware.cgi;h=eef1c11407e6327522312fec1f4511f922600279;hp=9cea341d7358c9a1cd5953a5e7dbcd9304ac03e0;hb=f822e27a1e00594332ffa487a1c284234c5580a6;hpb=b65b8096089410001dfbcd35f9a56f9405b9f5f1

diff --git a/httemplate/view/svc_hardware.cgi b/httemplate/view/svc_hardware.cgi
index 9cea341d7..eef1c1140 100644
--- a/httemplate/view/svc_hardware.cgi
+++ b/httemplate/view/svc_hardware.cgi
@@ -6,19 +6,36 @@
 %>
 <%init>
 
+my $conf = new FS::Conf;
 my $fields = FS::svc_hardware->table_info->{'fields'};
 my %labels = map { $_ =>  ( ref($fields->{$_})
                              ? $fields->{$_}{'label'}
                              : $fields->{$_}
                          );
                  } keys %$fields;
-my $model = { field => 'typenum',
-              type  => 'text',
-              value => sub { $_[0]->hardware_type->model }
-            };
+
+$labels{'display_hw_addr'} = 'Hardware address';
+
+my $model =  { field => 'typenum',
+               type  => 'text',
+               value_callback => sub { $_[0]->hardware_type->description }
+             };
 my $status = { field => 'statusnum',
                type  => 'text',
-               value => sub { $_[0]->status_label }
-            };
-my @fields = ($model, qw( serial hw_addr ip_addr ), $status, 'note' );
+               value_callback => sub { $_[0]->status_label }
+             };
+my $note =   { field => 'note',
+               type  => 'text',
+               value_callback => sub { encode_entities($_[0]->note) }
+             };
+
+my @fields = (
+  $model,
+  'serial',
+  'display_hw_addr',
+  'ip_addr',
+  'smartcard',
+  $status,
+  $note,
+);
 </%init>