# 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.12 2011-02-27 19:14:47 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;
'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;
"/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 {