[freeside-commits] freeside/httemplate/view svc_phone.cgi, 1.31, 1.32

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/view
In directory wavetail.420.am:/tmp/cvs-serv12250/httemplate/view

Modified Files:
	svc_phone.cgi 
Log Message:
(refactor svc_phone to use elements/svc_devices.html) add dsl_device to track mac addresses, RT#13656

Index: svc_phone.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_phone.cgi,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -w -d -r1.31 -r1.32
--- svc_phone.cgi	18 May 2011 00:55:36 -0000	1.31
+++ svc_phone.cgi	6 Oct 2011 07:00:03 -0000	1.32
@@ -56,69 +56,10 @@
   ###
   # Devices
   ###
-
-  my $devices = '';
-
-  my $sth = dbh->prepare("SELECT COUNT(*) FROM part_device") #WHERE disabled = '' OR disabled IS NULL;");
-    or die dbh->errstr;
-  $sth->execute or die $sth->errstr;
-  my $num_part_device = $sth->fetchrow_arrayref->[0];
-
-  my @phone_device = $svc_phone->phone_device;
-  if ( @phone_device || $num_part_device ) {
-    my $svcnum = $svc_phone->svcnum;
-    $devices .=
-      qq[Devices (<A HREF="${p}edit/phone_device.html?svcnum=$svcnum">Add device</A>)<BR>];
-    if ( @phone_device ) {
-
-      $devices .= qq!
-        <SCRIPT>
-          function areyousure(href) {
-           if (confirm("Are you sure you want to delete this device?") == true)
-             window.location.href = href;
-          }
-        </SCRIPT>
-      !;
-
-
-      $devices .= 
-        include('/elements/table-grid.html').
-          '<TR>'.
-            '<TH CLASS="grid" BGCOLOR="#cccccc">Type</TH>'.
-            '<TH CLASS="grid" BGCOLOR="#cccccc">MAC Addr</TH>'.
-            '<TH CLASS="grid" BGCOLOR="#cccccc"></TH>'.
-            '<TH CLASS="grid" BGCOLOR="#cccccc"></TH>'.
-          '</TR>';
-      my $bgcolor1 = '#eeeeee';
-      my $bgcolor2 = '#ffffff';
-      my $bgcolor = '';
-
-      foreach my $phone_device ( @phone_device ) {
-
-        if ( $bgcolor eq $bgcolor1 ) {
-          $bgcolor = $bgcolor2;
-        } else {
-          $bgcolor = $bgcolor1;
-        }
-        my $td = qq(<TD CLASS="grid" BGCOLOR="$bgcolor">);
-
-        my $devicenum = $phone_device->devicenum;
-        my $export_links = join( '<BR>', @{ $phone_device->export_links } );
-
-        $devices .= '<TR>'.
-                      $td. $phone_device->part_device->devicename. '</TD>'.
-                      $td. $phone_device->mac_addr. '</TD>'.
-                      $td. $export_links. '</TD>'.
-                      "$td( ".
-                        qq(<A HREF="${p}edit/phone_device.html?$devicenum">edit</A> | ).
-                        qq(<A HREF="javascript:areyousure('${p}misc/delete-phone_device.html?$devicenum')">delete</A>).
-                      ' )</TD>'.
-                    '</TR>';
-      }
-      $devices .= '</TABLE><BR>';
-    }
-    $devices .= '<BR>';
-  }
+  my $devices = include('elements/svc_devices.html',
+                          'svc_x' => $svc_phone,
+                          'table' => 'phone_device',
+                       );
 
   ##
   # CDR links