jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

/ip_addresses: allow grouping IPs by subnet.

Browse Source
This commit is contained in:
evazion
2019-11-11 19:41:09 -06:00
parent bf6bb94702
commit 68e1140b0d
4 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/ip_addresses_controller.rb
View File

@@ -4,10 +4,10 @@ class IpAddressesController < ApplicationController
def index
if search_params[:group_by] == "ip_addr"
@ip_addresses = IpAddress.search(search_params).group_by_ip_addr
@ip_addresses = IpAddress.search(search_params).group_by_ip_addr(search_params[:ipv4_masklen], search_params[:ipv6_masklen]).paginate(params[:page], limit: params[:limit] || 1000)
respond_with(@ip_addresses)
elsif search_params[:group_by] == "user"
@ip_addresses = IpAddress.search(search_params).group_by_user
@ip_addresses = IpAddress.includes(:user).search(search_params).group_by_user.paginate(params[:page], limit: params[:limit] || 1000)
respond_with(@ip_addresses)
else
@ip_addresses = IpAddress.includes(:user, :model).paginated_search(params)