Convert trace counting to use modern arel methods

[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 e681a194a842d2c4e6376e557ddb45ac7b6aabca..2284174be1e639aac5fabce5881e2bfdda9950a8 100644 (file)
--- a/app/controllers/user_blocks_controller.rb
+++ b/app/controllers/user_blocks_controller.rb
@@ -35,13 +35,13 @@ class UserBlocksController < ApplicationController
 
   def create
     if @valid_params 
 
   def create
     if @valid_params 

-      @user_block = UserBlock.new({
+      @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,
         :needs_view => params[:user_block][:needs_view]
         :user_id => @this_user.id,
         :creator_id => @user.id,
         :reason => params[:user_block][:reason],
         :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)
     
       if @user_block.save
         flash[:notice] = t('user_block.create.flash', :name => @this_user.display_name)


@@ -59,11 +59,11 @@ class UserBlocksController < ApplicationController
       if @user_block.creator_id != @user.id
         flash[:error] = t('user_block.update.only_creator_can_edit')
         redirect_to :action => "edit"
       if @user_block.creator_id != @user.id
         flash[:error] = t('user_block.update.only_creator_can_edit')
         redirect_to :action => "edit"

-      elsif @user_block.update_attributes({
+      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]
               :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')
         redirect_to(@user_block)
       else
         flash[:notice] = t('user_block.update.success')
         redirect_to(@user_block)
       else


@@ -106,28 +106,6 @@ class UserBlocksController < ApplicationController
   end
 
   private
   end
 
   private

-  ##
-  # require that the user is a moderator, or fill out a helpful error message
-  # and return them to the blocks index.
-  def require_moderator
-    unless @user.moderator?
-      if request.get?
-        flash[:error] = t('user_block.filter.not_a_moderator')
-        redirect_to :action => 'index'
-      else
-        render :nothing => true, :status => :forbidden
-      end
-    end
-  end
-
-  ##
-  # ensure that there is a "this_user" instance variable
-  def lookup_this_user
-    unless @this_user = User.find_by_display_name(params[:display_name])
-      render_unknown_user params[:display_name]
-    end
-  end
-

   ##
   # ensure that there is a "user_block" instance variable
   def lookup_user_block
   ##
   # ensure that there is a "user_block" instance variable
   def lookup_user_block