diff options
| author | Mark Wells <mark@freeside.biz> | 2014-08-15 16:08:24 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2014-08-15 16:08:24 -0700 |
| commit | d87c9f804b0cb7b6798bf770f753fb83022f5e6a (patch) | |
| tree | 08081d967033fbcdbdd834bb49e841f7325c4afd | |
| parent | 383f177db523f12b88e7b3c4dd2c3ee51f750cff (diff) | |
SNMP export: allow manually entering OIDs, #20945
| -rw-r--r-- | FS/FS/part_export/broadband_snmp.pm | 7 | ||||
| -rw-r--r-- | httemplate/edit/elements/part_export/broadband_snmp.html | 7 | ||||
| -rw-r--r-- | httemplate/edit/process/part_export.cgi | 2 | ||||
| -rw-r--r-- | httemplate/elements/select-mib-popup.html | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/FS/FS/part_export/broadband_snmp.pm b/FS/FS/part_export/broadband_snmp.pm index 9afca0872..0ba275670 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 4c0367c5a..ebb765dee 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 e0c470675..7fe3d0369 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 bd485ef65..f95ce2b97 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> |