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

/ip_addresses: add paginator to group_by=(user|ip_addr) pages.

Browse Source
This commit is contained in:
evazion
2020-02-05 14:28:30 -06:00
parent 089c304992
commit 2d0e0769cb
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/ip_addresses_controller.rb
View File

@@ -3,12 +3,14 @@ class IpAddressesController < ApplicationController
before_action :moderator_only
def index
@ip_addresses = IpAddress.visible(CurrentUser.user).paginated_search(params)
if 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)
@ip_addresses = @ip_addresses.group_by_ip_addr(search_params[:ipv4_masklen], search_params[:ipv6_masklen])
elsif search_params[:group_by] == "user"
@ip_addresses = IpAddress.includes(:user).search(search_params).group_by_user.paginate(params[:page], limit: params[:limit] || 1000)
@ip_addresses = @ip_addresses.group_by_user.includes(:user)
else
@ip_addresses = IpAddress.includes(:user, :model).paginated_search(params)
@ip_addresses = @ip_addresses.includes(:user, :model)
end
respond_with(@ip_addresses)