[freeside-commits] branch FREESIDE_3_BRANCH updated. 15deaf0aa18910232f99a38398995b3abc412411

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  15deaf0aa18910232f99a38398995b3abc412411 (commit)
      from  b77e2c257c0ac8c6195a0525c599eafd72997192 (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 15deaf0aa18910232f99a38398995b3abc412411
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Aug 15 16:08:11 2014 -0700

    SNMP export: allow manually entering OIDs, #20945

diff --git a/FS/FS/part_export/broadband_snmp.pm b/FS/FS/part_export/broadband_snmp.pm
index 9afca08..0ba2756 100644
--- a/FS/FS/part_export/broadband_snmp.pm
+++ b/FS/FS/part_export/broadband_snmp.pm
@@ -34,9 +34,10 @@ tie my %options, 'Tie::IxHash',
    },
   'community' => { label=>'Community', default=>'public' },
 
-  'action' => { multiple=>1 },
-  'oid'    => { multiple=>1 },
-  'value'  => { multiple=>1 },
+  'action'  => { multiple=>1 },
+  'oid'     => { multiple=>1 },
+  'value'   => { multiple=>1 },
+  'datatype'=> { multiple=>1 },
 
   'ip_addr_change_to_new' => { 
     label=>'Send IP address changes to new address',
diff --git a/httemplate/edit/elements/part_export/broadband_snmp.html b/httemplate/edit/elements/part_export/broadband_snmp.html
index 4c0367c..ebb765d 100644
--- a/httemplate/edit/elements/part_export/broadband_snmp.html
+++ b/httemplate/edit/elements/part_export/broadband_snmp.html
@@ -29,7 +29,7 @@
 function open_select_mib(obj) {
   nd(1); // if there's already one open, close it
   var rownum = obj.rownum;
-  var curr_oid = obj.value || '';
+  var curr_oid = obj.form.elements['oid' + rownum].value || '';
   var url = '<%$fsurl%>/elements/select-mib-popup.html?' +
             'callback=receive_mib;' +
             'arg=' + rownum +
@@ -66,10 +66,11 @@ function receive_mib(obj, rownum) {
     </SELECT>
   </TD>
   <TD>
-    <INPUT NAME="oid" ID="oid" SIZE="60" onclick="open_select_mib(this)">
+    <INPUT NAME="oid" ID="oid" SIZE="54">
+    <INPUT TYPE="button" VALUE="..." ID="openselector" onclick="open_select_mib(this)">
   </TD>
   <TD>
-    <INPUT TYPE="text" NAME="datatype" ID="datatype" READONLY=1>
+    <INPUT TYPE="text" NAME="datatype" ID="datatype">
   </TD>
   <TD>
     <INPUT NAME="value" ID="value">
diff --git a/httemplate/edit/process/part_export.cgi b/httemplate/edit/process/part_export.cgi
index e0c4706..7fe3d03 100644
--- a/httemplate/edit/process/part_export.cgi
+++ b/httemplate/edit/process/part_export.cgi
@@ -41,7 +41,7 @@ foreach my $option (split(',', $cgi->param('multi_options'))) {
 foreach my $option (split(',', $cgi->param('multi_options'))) {
   my $value = '';
   foreach my $row (sort keys %{$optionrows{_ALL_}}) {
-    $value .= ($optionrows{$option}{$row} || '') . "\n";
+    $value .= ($optionrows{$option}{$row} // '') . "\n";
   }
   chomp($value);
   $options{$option} = $value;
diff --git a/httemplate/elements/select-mib-popup.html b/httemplate/elements/select-mib-popup.html
index bd485ef..f95ce2b 100644
--- a/httemplate/elements/select-mib-popup.html
+++ b/httemplate/elements/select-mib-popup.html
@@ -7,7 +7,7 @@
 </TR>
 <TR>
   <TD ALIGN="right">Object:</TD>
-  <TD><INPUT TYPE="text" NAME="path" ID="input_path" WIDTH="100%"></TD>
+  <TD><INPUT TYPE="text" NAME="path" ID="input_path" SIZE=50 WIDTH="100%"></TD>
 </TR>
 <TR>
   <TD COLSPAN=2>

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

Summary of changes:
 FS/FS/part_export/broadband_snmp.pm                      |    7 ++++---
 httemplate/edit/elements/part_export/broadband_snmp.html |    7 ++++---
 httemplate/edit/process/part_export.cgi                  |    2 +-
 httemplate/elements/select-mib-popup.html                |    2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)