[freeside-commits] branch master updated. da6b5077952f9630f68363df66fa80efc8f1d5b7

[Jonathan Prykop]

The branch, master has been updated
       via  da6b5077952f9630f68363df66fa80efc8f1d5b7 (commit)
      from  08adf9b62500806763ff3a470228dfdd45494598 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit da6b5077952f9630f68363df66fa80efc8f1d5b7
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Tue Dec 15 20:31:53 2015 -0600

    RT#39115: View SNMP info on svc_broadband service [got rid of dialog, displays inline]

diff --git a/FS/FS/part_export/broadband_snmp_get.pm b/FS/FS/part_export/broadband_snmp_get.pm
index faa51ed..fafe91a 100644
--- a/FS/FS/part_export/broadband_snmp_get.pm
+++ b/FS/FS/part_export/broadband_snmp_get.pm
@@ -30,8 +30,7 @@ tie my %options, 'Tie::IxHash',
   'options' => \%options,
   'no_machine' => 1,
   'notes'   => <<'END',
-Use this export to configure the community and object ids for displaying realtime 
-SNMP data from the service IP address when viewing a provisioned service.  Timeout is
+Display broadband service status information via SNMP.  Timeout is
 per object, and should be small enough for realtime use.  This export takes no action 
 during provisioning itself;  it is expected that snmp will be separately
 configured on the service machine.
diff --git a/httemplate/elements/broadband_snmp_get-dialog.html b/httemplate/elements/broadband_snmp_get.html
similarity index 57%
rename from httemplate/elements/broadband_snmp_get-dialog.html
rename to httemplate/elements/broadband_snmp_get.html
index 61bb9c7..d4cc4e4 100644
--- a/httemplate/elements/broadband_snmp_get-dialog.html
+++ b/httemplate/elements/broadband_snmp_get.html
@@ -1,9 +1,10 @@
 <%doc>
-Adds a link to display snmp statistics based on broadband_snmp_get export config.
-Performs necessary checks such that, if no such exports are configured for the passed 
-service, returns blank space (ie may be safely invoked even if no exports are configured.)
+Adds a table to display dynamically loaded snmp statistics based on broadband_snmp_get 
+export config.  Performs necessary checks such that, if no such exports are configured 
+for the passed service, returns blank space (ie may be safely invoked even if no exports 
+are configured.)
 
-  <& '/elements/broadband_snmp_get-dialog.html', svc => $svc &>
+  <& '/elements/broadband_snmp_get.html', svc => $svc &>
 
 </%doc>
 % if (@snmp) {
@@ -11,13 +12,10 @@ service, returns blank space (ie may be safely invoked even if no exports are co
    'url'  => $fsurl.'misc/xmlhttp-broadband_snmp_get.cgi',
    'subs' => [ 'broadband_snmp_get_request' ]
  &>
+<DIV ID="broadband_snmp_get"></DIV>
 <SCRIPT>
 function broadband_snmp_get (svcnum) {
-  var jqd = $( '#broadband_snmp_get_dialog' );
-  if (!jqd.dialog( 'isOpen' )) {
-    jqd.dialog( 'open' );
-  }
-  document.getElementById('broadband_snmp_get_dialog').innerHTML = '<B>Loading...</B>';
+  document.getElementById('broadband_snmp_get').innerHTML = 'Loading SNMP...';
   broadband_snmp_get_request('svcnum',svcnum,
     function (result) {
       var objects = JSON.parse(result) || [];
@@ -41,24 +39,14 @@ function broadband_snmp_get (svcnum) {
           }
           table.appendChild(row);
         }
-        var dialog = document.getElementById('broadband_snmp_get_dialog');
-        dialog.innerHTML = '';
-        dialog.appendChild(table);
+        var resultblock = document.getElementById('broadband_snmp_get');
+        resultblock.innerHTML = '';
+        resultblock.appendChild(table);
       }  // if objects.length
     }  // function
   ); // broadband_snmp_get_request
 } // broadband_snmp_get
-</SCRIPT>
-<SPAN ID="broadband_snmp_get_dialog"></SPAN>
-<SPAN ID="broadband_snmp_get_link">
-<A HREF="javascript: void(0)" onclick="broadband_snmp_get('<% $svcnum %>')">(snmp)</A>
-</SPAN>
-<SCRIPT>
-$( '#broadband_snmp_get_dialog' ).dialog({
-  position: { my: "left top", at: "left top", of: "#broadband_snmp_get_link" },
-  autoOpen: false,
-  title: 'SNMP',
-});
+broadband_snmp_get('<% $svcnum %>');
 </SCRIPT>
 % } #if @snmp
 <%init>
diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index bc272e8..0517c30 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -72,7 +72,6 @@ sub ip_addr {
   my $out = $ip_addr;
   $out .= ' (' . include('/elements/popup_link-ping.html', ip => $ip_addr) . ')'
     if $ip_addr;
-  $out .= include('/elements/broadband_snmp_get-dialog.html', svc => $svc);
   if ($svc->cust_svc->part_svc->part_export('cacti')) {
     $out .= ' (<A HREF="'
          .  popurl(2)
@@ -84,6 +83,7 @@ sub ip_addr {
     $out .= '<br>Netmask: ' . $addr_block->NetAddr->mask .
             '<br>Gateway: ' . $addr_block->ip_gateway;
   }
+  $out .= include('/elements/broadband_snmp_get.html', svc => $svc);
   $out;
 }
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/part_export/broadband_snmp_get.pm            |    3 +-
 ...nmp_get-dialog.html => broadband_snmp_get.html} |   34 +++++++-------------
 httemplate/view/svc_broadband.cgi                  |    2 +-
 3 files changed, 13 insertions(+), 26 deletions(-)
 rename httemplate/elements/{broadband_snmp_get-dialog.html => broadband_snmp_get.html} (57%)