Use h2 as the main header on the map-ui panel

[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 2b7bf3f58f7e190a5346abcaf45d3fa2c1a0e3a4..546c8233c65a4d5f4eeb42d97cc76dc0558c1d28 100644 (file)
--- a/app/controllers/user_blocks_controller.rb
+++ b/app/controllers/user_blocks_controller.rb
@@ -1,10 +1,13 @@
 class UserBlocksController < ApplicationController
 class UserBlocksController < ApplicationController

+  include UserMethods
+

   layout "site"
 
   before_action :authorize_web
   before_action :set_locale
   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]
+
+  authorize_resource
+

   before_action :lookup_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 :lookup_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]


@@ -31,7 +34,7 @@ class UserBlocksController < ApplicationController
   end
 
   def edit
   end
 
   def edit

-    params[:user_block_period] = ((@user_block.ends_at - Time.now.getutc) / 1.hour).ceil.to_s
+    params[:user_block_period] = ((@user_block.ends_at - Time.now.utc) / 1.hour).ceil.to_s

   end
 
   def create
   end
 
   def create


@@ -40,7 +43,7 @@ class UserBlocksController < ApplicationController
         :user => @user,
         :creator => current_user,
         :reason => params[:user_block][:reason],
         :user => @user,
         :creator => current_user,
         :reason => params[:user_block][:reason],

-        :ends_at => Time.now.getutc + @block_period.hours,
+        :ends_at => Time.now.utc + @block_period.hours,

         :needs_view => params[:user_block][:needs_view]
       )
 
         :needs_view => params[:user_block][:needs_view]
       )
 


@@ -61,7 +64,7 @@ class UserBlocksController < ApplicationController
         flash[:error] = t(".only_creator_can_edit")
         redirect_to :action => "edit"
       elsif @user_block.update(
         flash[:error] = t(".only_creator_can_edit")
         redirect_to :action => "edit"
       elsif @user_block.update(

-        :ends_at => Time.now.getutc + @block_period.hours,
+        :ends_at => Time.now.utc + @block_period.hours,

         :reason => params[:user_block][:reason],
         :needs_view => params[:user_block][:needs_view]
       )
         :reason => params[:user_block][:reason],
         :needs_view => params[:user_block][:needs_view]
       )


@@ -78,11 +81,9 @@ class UserBlocksController < ApplicationController
   ##
   # revokes the block, setting the end_time to now
   def revoke
   ##
   # revokes the block, setting the end_time to now
   def revoke

-    if params[:confirm]
-      if @user_block.revoke! current_user
-        flash[:notice] = t ".flash"
-        redirect_to(@user_block)
-      end
+    if request.post? && params[:confirm] && @user_block.revoke!(current_user)
+      flash[:notice] = t ".flash"
+      redirect_to(@user_block)

     end
   end
 
     end
   end
 


@@ -127,7 +128,7 @@ class UserBlocksController < ApplicationController
     @block_period = params[:user_block_period].to_i
     @valid_params = false
 
     @block_period = params[:user_block_period].to_i
     @valid_params = false
 

-    if !UserBlock::PERIODS.include?(@block_period)
+    if UserBlock::PERIODS.exclude?(@block_period)

       flash[:error] = t("user_blocks.filter.block_period")
 
     elsif @user_block && !@user_block.active?
       flash[:error] = t("user_blocks.filter.block_period")
 
     elsif @user_block && !@user_block.active?