svc_dish and svc_hardware fixes, #11454

1 files changed, 9 insertions, 1 deletions

diff --git a/httemplate/search/report_svc_hardware.html b/httemplate/search/report_svc_hardware.html
index 4a763b0b4..07a6241e3 100755
--- a/httemplate/search/report_svc_hardware.html
+++ b/httemplate/search/report_svc_hardware.html
@@ -20,7 +20,7 @@
 
     <% include('/elements/tr-input-text.html',
                   'field' => 'serial',
-                  'label' => 'Serial #',
+                  'label' => 'Serial number',
               ) %>
     <% include('/elements/tr-input-text.html',
                   'field' => 'hw_addr',
@@ -30,12 +30,20 @@
                   'field' => 'ip_addr',
                   'label' => 'IP address',
               ) %>
+    <% include('/elements/tr-input-text.html',
+                  'field' => 'smartcard',
+                  'label' => 'Smartcard #',
+              ) %>
     <% include('/elements/tr-select-table.html',
                   'field'     => 'statusnum',
                   'label'     => 'Service status',
                   'table'     => 'hardware_status',
                   'name_col'  => 'label',
                   'empty_label' => 'any',
+                  'hashref'   => {},
+                  'extra_sql' => ' WHERE hardware_status.disabled IS NULL
+OR (SELECT COUNT(*) FROM svc_hardware 
+  WHERE svc_hardware.statusnum = hardware_status.statusnum) > 0',
               ) %>
  
   </TABLE>