From d98bc0d258abe1bf1b059af7dc701ba3631fd228 Mon Sep 17 00:00:00 2001
From: levinse <levinse>
Date: Mon, 7 Feb 2011 23:22:34 +0000
Subject: torrus, UI, RT10574

---
 httemplate/view/svc_port.cgi | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'httemplate/view/svc_port.cgi')

diff --git a/httemplate/view/svc_port.cgi b/httemplate/view/svc_port.cgi
index eec803d5a..a2b12b778 100644
--- a/httemplate/view/svc_port.cgi
+++ b/httemplate/view/svc_port.cgi
@@ -20,16 +20,6 @@ my %labels = map { $_ =>  ( ref($fields->{$_})
                  } keys %$fields;
 my @fields = keys %$fields;
 
-my $svcnum;
-if ( $cgi->param('svcnum') ) {
-  $cgi->param('svcnum') =~ /^(\d+)$/ or die "unparsable svcnum";
-  $svcnum = $1;
-} else {
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/ or die "no svcnum";
-  $svcnum = $1;
-}
-
 my $start = $cgi->param('start');
 my $end = $cgi->param('end');
 
@@ -42,10 +32,15 @@ sub preset_range {
 }
 
 my $html_foot = sub {
+    my $svc_port = shift;
+    my $svcnum = $svc_port->svcnum;
     my $default_end = time;
     my $default_start = $default_end-86400;
     my $graph = '';
 
+    my $nms = new FS::NetworkMonitoringSystem;
+    my $link = $nms->port_graphs_link($svc_port->serviceid);
+
     if($start && $end) {
 	$graph = "<BR><BR><IMG SRC=${p}/view/port_graph.html?svcnum=$svcnum;".
 		"start=".str2time("$start 00:00:00").";end=".str2time("$end 23:59:59").">";
@@ -60,6 +55,7 @@ my $html_foot = sub {
     </script>
     <FORM ACTION=? METHOD="GET">
     <INPUT TYPE="HIDDEN" NAME="svcnum" VALUE="'.$svcnum.'">
+    <A HREF="'.$link.'">Torrus Graphs</A><BR><BR>
     <B>Bandwidth Graph</B><BR>
 &nbsp; '.preset_range($default_start,$default_end,'Last Day',$date_format)
     .' | '.preset_range($default_end-86400*7,$default_end,'Last Week',$date_format)
-- 
cgit v1.2.1