projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "remove conflicts on libparams-classify-perl so we can install the version...
[freeside.git]
/
httemplate
/
view
/
svc_hardware.cgi
diff --git
a/httemplate/view/svc_hardware.cgi
b/httemplate/view/svc_hardware.cgi
index
725358c
..
eef1c11
100644
(file)
--- a/
httemplate/view/svc_hardware.cgi
+++ b/
httemplate/view/svc_hardware.cgi
@@
-13,31
+13,26
@@
my %labels = map { $_ => ( ref($fields->{$_})
: $fields->{$_}
);
} keys %$fields;
: $fields->{$_}
);
} keys %$fields;
+
+$labels{'display_hw_addr'} = 'Hardware address';
+
my $model = { field => 'typenum',
type => 'text',
my $model = { field => 'typenum',
type => 'text',
- value => sub { $_[0]->hardware_type->description }
+ value
_callback
=> sub { $_[0]->hardware_type->description }
};
my $status = { field => 'statusnum',
type => 'text',
};
my $status = { field => 'statusnum',
type => 'text',
- value => sub { $_[0]->status_label }
+ value
_callback
=> sub { $_[0]->status_label }
};
my $note = { field => 'note',
type => 'text',
};
my $note = { field => 'note',
type => 'text',
- value => sub { encode_entities($_[0]->note) }
+ value
_callback
=> sub { encode_entities($_[0]->note) }
};
};
-my $hw_addr ={ field => 'hw_addr',
- type => 'text',
- value => sub {
- my $hw_addr = $_[0]->hw_addr;
- $conf->exists('svc_hardware-check_mac_addr') ?
- join(':', $hw_addr =~ /../g) : $hw_addr
- },
- };
my @fields = (
$model,
'serial',
my @fields = (
$model,
'serial',
-
$hw_addr
,
+
'display_hw_addr'
,
'ip_addr',
'smartcard',
$status,
'ip_addr',
'smartcard',
$status,