[freeside-commits] freeside/torrus/perllib/Torrus/Renderer HTML.pm, 1.12, 1.13

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/torrus/perllib/Torrus/Renderer
In directory wavetail.420.am:/tmp/cvs-serv17734/torrus/perllib/Torrus/Renderer

Modified Files:
	HTML.pm 
Log Message:
torrus virtual ports, RT#10574

Index: HTML.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/torrus/perllib/Torrus/Renderer/HTML.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -d -r1.12 -r1.13
--- HTML.pm	27 Feb 2011 19:14:47 -0000	1.12
+++ HTML.pm	27 Feb 2011 19:20:37 -0000	1.13
@@ -144,8 +144,16 @@
                              "/view/svc_port.cgi?". $svc_port->svcnum;
                    return "<A HREF='$url'>View Service</A>";
                 } else {
+                  my $component =
+                   $nms->find_torrus_srvderive_component($serviceids->{$iface});
+                  
+                  if ($component) {
+                     return $serviceids->{$iface}. ' combined into '.
+                            $component->torrus_srvderive->serviceid;
+                  } else {
                    return 'Monitored as '. $serviceids->{$iface}.
-                          '; customer service not yet provisioned';
+                            '; not yet provisioned or combined';
+                  }
                 }
 
               } else {