cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/4637'

Browse source
This commit is contained in:
Tom Hughes 2024-04-01 18:54:52 +01:00
commit c79da4746a
4 changed files with 88 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/controllers/user_blocks_controller.rb
View file

@ -1,5 +1,6 @@
class UserBlocksController < ApplicationController
include UserMethods
include PaginationMethods
layout "site"
@ -16,10 +17,10 @@ class UserBlocksController < ApplicationController
def index
@params = params.permit
@user_blocks_pages, @user_blocks = paginate(:user_blocks,
:include => [:user, :creator, :revoker],
:order => "user_blocks.ends_at DESC",
:per_page => 20)
user_blocks = UserBlock.all
@user_blocks, @newer_user_blocks_id, @older_user_blocks_id = get_page_items(user_blocks, :includes => [:user, :creator, :revoker])
end
def show
@ -103,22 +104,20 @@ class UserBlocksController < ApplicationController
# shows a list of all the blocks on the given user
def blocks_on
@params = params.permit(:display_name)
@user_blocks_pages, @user_blocks = paginate(:user_blocks,
:include => [:user, :creator, :revoker],
:conditions => { :user_id => @user.id },
:order => "user_blocks.ends_at DESC",
:per_page => 20)
user_blocks = UserBlock.where(:user => @user)
@user_blocks, @newer_user_blocks_id, @older_user_blocks_id = get_page_items(user_blocks, :includes => [:user, :creator, :revoker])
end
##
# shows a list of all the blocks by the given user.
def blocks_by
@params = params.permit(:display_name)
@user_blocks_pages, @user_blocks = paginate(:user_blocks,
:include => [:user, :creator, :revoker],
:conditions => { :creator_id => @user.id },
:order => "user_blocks.ends_at DESC",
:per_page => 20)
user_blocks = UserBlock.where(:creator => @user)
@user_blocks, @newer_user_blocks_id, @older_user_blocks_id = get_page_items(user_blocks, :includes => [:user, :creator, :revoker])
end
private