Merge remote-tracking branch 'openstreetmap/pull/1240'

[rails.git] / app / controllers / user_blocks_controller.rb

diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb
index 1b2ff89654ebbdb0068eae69438af7d2697faff8..467ca4c3c13ec02f4a0baaa15c45e7df2e6c9b0f 100644 (file)
--- 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,
@@ -44,7 +44,7 @@ class UserBlocksController < ApplicationController
       )
 
       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"
@@ -57,14 +57,14 @@ class UserBlocksController < ApplicationController
   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]
-            )
-        flash[:notice] = t('user_block.update.success')
+      )
+        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
@@ -125,10 +125,10 @@ class UserBlocksController < ApplicationController
     @valid_params = false
 
     if !UserBlock::PERIODS.include?(@block_period)
-      flash[:error] = t('user_block.filter.block_period')
+      flash[:error] = t("user_block.filter.block_period")
 
     elsif @user_block && !@user_block.active?
-      flash[:error] = t('user_block.filter.block_expired')
+      flash[:error] = t("user_block.filter.block_expired")
 
     else
       @valid_params = true