RT#18834 Cacti integration [phase one, simple but stable]

[freeside.git] / httemplate / view / svc_broadband.cgi

diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index 7d6520e..9fe10bd 100644 (file)
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -1,8 +1,12 @@
 <& elements/svc_Common.html,
-  table   => 'svc_broadband',
-  labels  => \%labels,
-  fields  => \@fields,
+  table        => 'svc_broadband',
+  labels       => \%labels,
+  fields       => \@fields,
   svc_callback => \&svc_callback,
+  radius_usage => 1,
+  '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')
 &>
 <%init>
 
@@ -31,7 +35,7 @@ my @fields = (
   'speed_up',
   { field => 'ip_addr', value_callback => \&ip_addr },
   { field => 'sectornum', value_callback => \&sectornum },
-  { field => 'mac_addr', value_callback => \&mac_addr },
+  { field => 'mac_addr', type=>'mac_addr', value_callback => \&mac_addr },
   #'latitude',
   #'longitude',
   { field => 'coordinates', value_callback => \&coordinates },
@@ -68,6 +72,17 @@ sub ip_addr {
   my $out = $ip_addr;
   $out .= ' (' . include('/elements/popup_link-ping.html', ip => $ip_addr) . ')'
     if $ip_addr;
+  if ($svc->cacti_leaf_id) {
+    # should only ever be one, but not sure if that is enforced
+    my ($cacti) = $svc->cust_svc->part_svc->part_export('cacti');
+    $out .= ' (<A HREF="' 
+         .  $cacti->option('base_url')
+         .  'graph_view.php?action=tree&tree_id='
+         .  $cacti->option('tree_id')
+         .  '&leaf_id='
+         .  $svc->cacti_leaf_id
+         .  '">cacti</A>)';
+  }
   if ( my $addr_block = $svc->addr_block ) {
     $out .= '<br>Netmask: ' . $addr_block->NetAddr->mask .
             '<br>Gateway: ' . $addr_block->ip_gateway;
@@ -77,7 +92,7 @@ sub ip_addr {
 
 sub mac_addr {
   my $svc = shift;
-  join(':', $svc->mac_addr =~ /../g);
+  $svc->mac_addr_formatted('U',':');
 }
 
 sub usergroup {