From d87c9f804b0cb7b6798bf770f753fb83022f5e6a Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Fri, 15 Aug 2014 16:08:24 -0700 Subject: SNMP export: allow manually entering OIDs, #20945 --- httemplate/edit/elements/part_export/broadband_snmp.html | 7 ++++--- httemplate/edit/process/part_export.cgi | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'httemplate/edit') 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) { - + + - + 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; -- cgit v1.2.1