summaryrefslogtreecommitdiff
path: root/httemplate/view
diff options
context:
space:
mode:
Diffstat (limited to 'httemplate/view')
-rw-r--r--httemplate/view/elements/svc_Common.html9
-rw-r--r--httemplate/view/svc_hardware.cgi3
2 files changed, 12 insertions, 0 deletions
diff --git a/httemplate/view/elements/svc_Common.html b/httemplate/view/elements/svc_Common.html
index a7f8f6df4..d735195fe 100644
--- a/httemplate/view/elements/svc_Common.html
+++ b/httemplate/view/elements/svc_Common.html
@@ -57,6 +57,7 @@ function areyousure(href) {
<% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
+% my @inventory_items = $svc_x->inventory_item;
% foreach my $f ( @$fields ) {
%
% my($field, $type, $value);
@@ -76,6 +77,14 @@ function areyousure(href) {
% }
%
% my $columndef = $part_svc->part_svc_column($field);
+% if ( $columndef->columnflag =~ /^[MA]$/ && $columndef->columnvalue =~ /,/ )
+% {
+% # inventory-select field with multiple classes
+% # show the class name to disambiguate
+% my ($item) = grep { $_->svc_field eq $field } @inventory_items;
+% my $class = qsearchs('inventory_class', { classnum => $item->classnum });
+% $value .= ' <i>('. $class->classname . ')</i>' if $class;
+% }
% unless ($columndef->columnflag eq 'F' && !length($columndef->columnvalue)) {
<TR>
diff --git a/httemplate/view/svc_hardware.cgi b/httemplate/view/svc_hardware.cgi
index aa3ff0091..eef1c1140 100644
--- a/httemplate/view/svc_hardware.cgi
+++ b/httemplate/view/svc_hardware.cgi
@@ -13,6 +13,9 @@ my %labels = map { $_ => ( ref($fields->{$_})
: $fields->{$_}
);
} keys %$fields;
+
+$labels{'display_hw_addr'} = 'Hardware address';
+
my $model = { field => 'typenum',
type => 'text',
value_callback => sub { $_[0]->hardware_type->description }