projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 80138 - Added config option to display/edit customer option to send or not send...
[freeside.git]
/
httemplate
/
view
/
elements
/
svc_devices.html
diff --git
a/httemplate/view/elements/svc_devices.html
b/httemplate/view/elements/svc_devices.html
index
38c6d09
..
3d4e1bb
100644
(file)
--- a/
httemplate/view/elements/svc_devices.html
+++ b/
httemplate/view/elements/svc_devices.html
@@
-15,7
+15,7
@@
%if ( @devices || $num_part_device || $table eq 'dsl_device' ) {
% my $svcnum = $svc_x->svcnum;
%if ( @devices || $num_part_device || $table eq 'dsl_device' ) {
% my $svcnum = $svc_x->svcnum;
- Devices
+ <FONT CLASS="fsinnerbox-title">Devices</FONT>
(<A HREF="<%$p%>edit/<%$table%>.html?svcnum=<%$svcnum%>">Add device</A>)
<BR>
(<A HREF="<%$p%>edit/<%$table%>.html?svcnum=<%$svcnum%>">Add device</A>)
<BR>
@@
-30,7
+30,7
@@
<& /elements/table-grid.html &>
<TR>
<& /elements/table-grid.html &>
<TR>
-% if ( $table
eq 'phone
_device' ) {
+% if ( $table
ne 'dsl_device' ) { # ( $table eq 'phone_device' || $table eq 'cable_device' || $table eq 'pbx
_device' ) {
<TH CLASS="grid" BGCOLOR="#cccccc">Type</TH>
% }
<TH CLASS="grid" BGCOLOR="#cccccc">MAC Addr</TH>
<TH CLASS="grid" BGCOLOR="#cccccc">Type</TH>
% }
<TH CLASS="grid" BGCOLOR="#cccccc">MAC Addr</TH>
@@
-58,10
+58,14
@@
% if $device->can('export_links');
<TR>
% if $device->can('export_links');
<TR>
-% if ( $table eq 'phone_device' ) { #$devices->can('part_device')
+% #$devices->can('part_device')
+% if ( $table eq 'phone_device' || $svc_x->isa('FS::device_Common') ) {
<% $td %><% $device->part_device->devicename |h %></TD>
% }
<% $td %><% $device->part_device->devicename |h %></TD>
% }
- <% $td %><% $device->mac_addr %></TD>
+ <% $td %><% $device->mac_addr_pretty %>
+% my $vendor = Net::MAC::Vendor::lookup($device->mac_addr_formatted('U',':'));
+ (<% $vendor ? $vendor->[0] : '' %>)
+ </TD>
<% $td %><% $export_links %></TD>
<% $td %>(
% unless ( $opt{'no_edit'} ) {
<% $td %><% $export_links %></TD>
<% $td %>(
% unless ( $opt{'no_edit'} ) {
@@
-84,7
+88,7
@@
my $table = $opt{'table'}; #part_device, dsl_device
my $svc_x = $opt{'svc_x'};
my $num_part_device = 0;
my $svc_x = $opt{'svc_x'};
my $num_part_device = 0;
-if ( $table
eq 'phone
_device' ) {
+if ( $table
ne 'dsl_device' ) { # ( $table eq 'phone_device' || $table eq 'cable_device' || $table eq 'pbx
_device' ) {
my $sth = dbh->prepare("SELECT COUNT(*) FROM part_device")
#WHERE disabled = '' OR disabled IS NULL;");
or die dbh->errstr;
my $sth = dbh->prepare("SELECT COUNT(*) FROM part_device")
#WHERE disabled = '' OR disabled IS NULL;");
or die dbh->errstr;
@@
-92,6
+96,8
@@
if ( $table eq 'phone_device' ) {
$num_part_device = $sth->fetchrow_arrayref->[0];
}
$num_part_device = $sth->fetchrow_arrayref->[0];
}
-my @devices = $svc_x->$table();
+my @devices = $svc_x->isa('FS::device_Common') ? $svc_x->device_objects()
+ : $table ? $svc_x->$table()
+ : ();
</%init>
</%init>