projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
383f177
)
SNMP export: allow manually entering OIDs, #20945
author
Mark Wells
<mark@freeside.biz>
Fri, 15 Aug 2014 23:08:24 +0000
(16:08 -0700)
committer
Mark Wells
<mark@freeside.biz>
Fri, 15 Aug 2014 23:08:24 +0000
(16:08 -0700)
FS/FS/part_export/broadband_snmp.pm
patch
|
blob
|
history
httemplate/edit/elements/part_export/broadband_snmp.html
patch
|
blob
|
history
httemplate/edit/process/part_export.cgi
patch
|
blob
|
history
httemplate/elements/select-mib-popup.html
patch
|
blob
|
history
diff --git
a/FS/FS/part_export/broadband_snmp.pm
b/FS/FS/part_export/broadband_snmp.pm
index
9afca08
..
0ba2756
100644
(file)
--- 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' },
},
'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',
'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
(file)
--- 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;
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 +
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>
</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>
</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">
</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
(file)
--- 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_}}) {
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;
}
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
(file)
--- 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>
</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>
</TR>
<TR>
<TD COLSPAN=2>