X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=torrus%2Fperllib%2FTorrus%2FRenderer%2FHTML.pm;h=6eec86d213e57991cb74896a4bbd0d9cda9c7462;hb=39bf086cae20fa746336953f46ae7b9245f3891f;hp=c52ce874d9b6594aed0b444df2121a134263e1f6;hpb=0cbc10709d30c4b4b0ebde8fcb4c0db65798687d;p=freeside.git

diff --git a/torrus/perllib/Torrus/Renderer/HTML.pm b/torrus/perllib/Torrus/Renderer/HTML.pm
index c52ce874d..6eec86d21 100644
--- a/torrus/perllib/Torrus/Renderer/HTML.pm
+++ b/torrus/perllib/Torrus/Renderer/HTML.pm
@@ -14,7 +14,7 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
-# $Id: HTML.pm,v 1.10 2011-02-27 19:10:15 ivan Exp $
+# $Id: HTML.pm,v 1.14 2011-03-01 00:09:39 ivan Exp $
 # Stanislav Sinyagin <ssinyagin@yahoo.com>
 
 package Torrus::Renderer::HTML;
@@ -120,7 +120,7 @@ sub render_html
         'freesideComponent' => sub { return $self->freesideComponent(@_); },
         'uri_escape'        => sub { return uri_escape(@_); },
         'matches'        => sub { return $_[0] =~ $_[1]; },
-        'slash2underscore' => sub { $_[0] =~ s/\//_/g; return $_[0]; },
+        'iface_underscore' => sub { $_[0] =~ s/[\/\.]/_/g; return $_[0]; },
         'load_nms'       => sub { return $self->load_nms; },
         'get_serviceids'    => sub { my $nms = shift; 
                                   my $router = shift;
@@ -137,15 +137,23 @@ sub render_html
 
               if ( $serviceids && $serviceids->{$iface} ) {
 
-                my $svc_port = $nms->find_svc($serviceids->{$iface})
+                my $svc_port = $nms->find_svc($serviceids->{$iface});
 
                 if ($svc_port) {
                    my $url = $Torrus::Freeside::FSURL.
-                             "/view/svc_port.cgi?".$svc_port->svcnum;
+                             "/view/svc_port.cgi?". $svc_port->svcnum;
                    return "<A HREF='$url'>View Service</A>";
                 } else {
-                   return 'Monitored as '. $serviceids->{$iface}.
-                          '; customer service not yet provisioned';
+                  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}.
+                            '; not yet provisioned or combined';
+                  }
                 }
 
               } else {