diff options
| author | Mitch Jackson <mitch@freeside.biz> | 2018-06-29 13:04:33 -0500 |
|---|---|---|
| committer | Mitch Jackson <mitch@freeside.biz> | 2018-10-23 17:22:27 -0400 |
| commit | 0327c04ef25a6879a85b7a4a352147f4746703ee (patch) | |
| tree | 06a6c72120ace5f3fe48f34a4f2e177c1ff7635f | |
| parent | e81c112f4cb6b4e617697a3308b5128ff14a5f4c (diff) | |
RT# 30783 Clean up json code for free_addrs
| -rw-r--r-- | FS/FS/svc_IP_Mixin.pm | 7 | ||||
| -rw-r--r-- | httemplate/elements/tr-select-router_block_ip.html | 2 | ||||
| -rw-r--r-- | httemplate/misc/xmlhttp-free_addresses_in_block.json.html (renamed from httemplate/json/free_addresses_in_block.json.html) | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/FS/FS/svc_IP_Mixin.pm b/FS/FS/svc_IP_Mixin.pm index 19c7e05..56165dc 100644 --- a/FS/FS/svc_IP_Mixin.pm +++ b/FS/FS/svc_IP_Mixin.pm @@ -132,7 +132,7 @@ sub _used_addresses { # parameter to bypass FS::Record objects creation and just # return hashrefs from DBI. 200,000 hashrefs are many seconds faster # than 200,000 FS::Record objects - my %qsearch = ( + my %qsearch_param = ( table => $class->table, select => $ip_field, hashref => \%qsearch, @@ -140,7 +140,8 @@ sub _used_addresses { ); if ( $octets ) { my $block_str = join('.', (split(/\D/, $block_na->first))[0..$octets-1]); - $qsearch{extra_sql} .= " AND $ip_field LIKE ".dbh->quote("${block_str}.%"); + $qsearch_param{extra_sql} + .= " AND $ip_field LIKE ".dbh->quote("${block_str}.%"); } if ( $block->ip_netmask % 8 ) { @@ -154,7 +155,7 @@ sub _used_addresses { return map { $_->$ip_field } - qsearch( \%qsearch ); + qsearch( \%qsearch_param ); } sub _is_used { diff --git a/httemplate/elements/tr-select-router_block_ip.html b/httemplate/elements/tr-select-router_block_ip.html index 535e953..eac41cf 100644 --- a/httemplate/elements/tr-select-router_block_ip.html +++ b/httemplate/elements/tr-select-router_block_ip.html @@ -71,7 +71,7 @@ function populate_ip_select() { % } if ( blocknum && $.isNumeric(blocknum) && ! e.is(':hidden')) { $.getJSON( - '<% $p %>json/free_addresses_in_block.json.html', + '<% $p %>misc/xmlhttp-free_addresses_in_block.json.html', {blocknum: blocknum}, function(ip_json) { $.each( ip_json, function(idx, val) { diff --git a/httemplate/json/free_addresses_in_block.json.html b/httemplate/misc/xmlhttp-free_addresses_in_block.json.html index 6785aac..801718d 100644 --- a/httemplate/json/free_addresses_in_block.json.html +++ b/httemplate/misc/xmlhttp-free_addresses_in_block.json.html @@ -3,7 +3,7 @@ Unless block is larger than /24 - Does somebody really want to populate 65k addresses into a HTML selectbox? </%doc> -<% encode_rest($json) %>\ +<% encode_json($json) %>\ <%init> my $json = []; |