X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9a9b045372a6f48420a9a6dacfde52c34ab7abce..fe1e28b4f45f6aa4bb53dc5163c187c5206b66a7:/app/controllers/user_blocks_controller.rb diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 467ca4c3c..ea5cdab10 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -12,6 +12,7 @@ class UserBlocksController < ApplicationController before_action :check_database_writable, :only => [:create, :update, :revoke] def index + @params = params.permit @user_blocks_pages, @user_blocks = paginate(:user_blocks, :include => [:user, :creator, :revoker], :order => "user_blocks.ends_at DESC", @@ -88,6 +89,7 @@ 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 => @this_user.id }, @@ -98,6 +100,7 @@ class UserBlocksController < ApplicationController ## # 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 => @this_user.id },