X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Felements%2Fsvc_Common.html;h=296c27bbc8e00a9a5ed5901827fedf36b754fe04;hb=ff27c3f36240aee48ed50153dd5d8fe3ac3f2443;hp=b7f7a2c63373801d64187445cef67e4fef605c49;hpb=4e68cf76788b220cc15f2a080df5e7a1ea4962b8;p=freeside.git diff --git a/httemplate/view/elements/svc_Common.html b/httemplate/view/elements/svc_Common.html index b7f7a2c63..296c27bbc 100644 --- a/httemplate/view/elements/svc_Common.html +++ b/httemplate/view/elements/svc_Common.html @@ -22,6 +22,11 @@ #at the very bottom (well, as low as you can go from here) 'html_foot' => '', + #only needed for svc_broadband Manage Devices link + 'manage_link' => scalar($conf->config('svc_broadband-manage_link')), + 'manage_link_text' => scalar($conf->config('svc_broadband-manage_link_text')), + 'manage_link-new_window' => $conf->exists('svc_broadband-manage_link-new_window') + ) @@ -70,7 +75,11 @@ function areyousure(href) { <% mt('Service #') |h %><% $svcnum %> % if ( $custnum ) { % my $url = $opt{'edit_url'} || $p. 'edit/'. $opt{'table'}. '.cgi?'; -<& /view/elements/svc_edit_link.html, 'svc' => $svc_x, 'edit_url' => $url &> +<& /view/elements/svc_edit_link.html, 'svc' => $svc_x, 'part_svc' => $part_svc, 'edit_url' => $url, + 'manage_link' => $opt{'manage_link'}, + 'manage_link_text' => $opt{'manage_link_text'}, + 'manage_link-new_window' => $opt{'manage_link-new_window'} +&> % }
@@ -222,7 +231,6 @@ my $format_field = sub { $field = $f; $type = 'text'; } - warn "$field\t$type\t$value\n"; my $columndef = $part_svc->part_svc_column($field); # skip fields that are fixed and empty @@ -275,8 +283,8 @@ my $format_field = sub { } elsif ( $type eq 'checkbox' ) { $value = $value eq 'Y' ? emt('Yes') : emt('No'); } elsif ( $type =~ /(input-)?mac_addr/ and $value =~ /\w/) { - my $vendor = Net::MAC::Vendor::lookup($value)->[0]; - $value .= " ($vendor)" if $vendor; + my $vendor = Net::MAC::Vendor::lookup($value); + $value .= ' ('. $vendor->[0]. ')' if $vendor; $value = $m->scomp('/elements/mac_addr.html', $value); }