X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/851de28303fc9c24d095b9452b862bea618ec0da..77fee91785af7630f608c41041cf4eeed6eeb369:/app/controllers/user_blocks_controller.rb diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 455e45c3f..467ca4c3c 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -1,15 +1,15 @@ class UserBlocksController < ApplicationController - layout 'site' - - before_filter :authorize_web - before_filter :set_locale - before_filter :require_user, :only => [:new, :create, :edit, :update, :revoke] - before_filter :require_moderator, :only => [:new, :create, :edit, :update, :revoke] - before_filter :lookup_this_user, :only => [:new, :create, :blocks_on, :blocks_by] - before_filter :lookup_user_block, :only => [:show, :edit, :update, :revoke] - before_filter :require_valid_params, :only => [:create, :update] - before_filter :check_database_readable - before_filter :check_database_writable, :only => [:create, :update, :revoke] + layout "site" + + before_action :authorize_web + before_action :set_locale + before_action :require_user, :only => [:new, :create, :edit, :update, :revoke] + before_action :require_moderator, :only => [:new, :create, :edit, :update, :revoke] + before_action :lookup_this_user, :only => [:new, :create, :blocks_on, :blocks_by] + before_action :lookup_user_block, :only => [:show, :edit, :update, :revoke] + before_action :require_valid_params, :only => [:create, :update] + before_action :check_database_readable + before_action :check_database_writable, :only => [:create, :update, :revoke] def index @user_blocks_pages, @user_blocks = paginate(:user_blocks, @@ -19,7 +19,7 @@ class UserBlocksController < ApplicationController end def show - if @user and @user.id == @user_block.user_id + if @user && @user.id == @user_block.user_id @user_block.needs_view = false @user_block.save! end @@ -34,17 +34,17 @@ class UserBlocksController < ApplicationController end def create - if @valid_params - @user_block = UserBlock.new({ + if @valid_params + @user_block = UserBlock.new( :user_id => @this_user.id, :creator_id => @user.id, :reason => params[:user_block][:reason], - :ends_at => Time.now.getutc() + @block_period.hours, + :ends_at => Time.now.getutc + @block_period.hours, :needs_view => params[:user_block][:needs_view] - }, :without_protection => true) - + ) + if @user_block.save - flash[:notice] = t('user_block.create.flash', :name => @this_user.display_name) + flash[:notice] = t("user_block.create.flash", :name => @this_user.display_name) redirect_to @user_block else render :action => "new" @@ -54,17 +54,17 @@ class UserBlocksController < ApplicationController end end - def update - if @valid_params + def update + if @valid_params if @user_block.creator_id != @user.id - flash[:error] = t('user_block.update.only_creator_can_edit') + flash[:error] = t("user_block.update.only_creator_can_edit") redirect_to :action => "edit" - elsif @user_block.update_attributes({ - :ends_at => Time.now.getutc() + @block_period.hours, - :reason => params[:user_block][:reason], - :needs_view => params[:user_block][:needs_view] - }, :without_protection => true) - flash[:notice] = t('user_block.update.success') + elsif @user_block.update_attributes( + :ends_at => Time.now.getutc + @block_period.hours, + :reason => params[:user_block][:reason], + :needs_view => params[:user_block][:needs_view] + ) + flash[:notice] = t("user_block.update.success") redirect_to(@user_block) else render :action => "edit" @@ -79,7 +79,7 @@ class UserBlocksController < ApplicationController def revoke if params[:confirm] if @user_block.revoke! @user - flash[:notice] = t'user_block.revoke.flash' + flash[:notice] = t "user_block.revoke.flash" redirect_to(@user_block) end end @@ -90,7 +90,7 @@ class UserBlocksController < ApplicationController def blocks_on @user_blocks_pages, @user_blocks = paginate(:user_blocks, :include => [:user, :creator, :revoker], - :conditions => {:user_id => @this_user.id}, + :conditions => { :user_id => @this_user.id }, :order => "user_blocks.ends_at DESC", :per_page => 20) end @@ -100,12 +100,13 @@ class UserBlocksController < ApplicationController def blocks_by @user_blocks_pages, @user_blocks = paginate(:user_blocks, :include => [:user, :creator, :revoker], - :conditions => {:creator_id => @this_user.id}, + :conditions => { :creator_id => @this_user.id }, :order => "user_blocks.ends_at DESC", :per_page => 20) end private + ## # ensure that there is a "user_block" instance variable def lookup_user_block @@ -124,14 +125,13 @@ class UserBlocksController < ApplicationController @valid_params = false if !UserBlock::PERIODS.include?(@block_period) - flash[:error] = t('user_block.filter.block_period') - - elsif @user_block and !@user_block.active? - flash[:error] = t('user_block.filter.block_expired') - + flash[:error] = t("user_block.filter.block_period") + + elsif @user_block && !@user_block.active? + flash[:error] = t("user_block.filter.block_expired") + else @valid_params = true end end - end