Cleanup leftover console log

[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 45cd537288d424bfbc627a084c4526c09b18640b..d5820568e45c8b1094a0137729d78ecb19a825d5 100644 (file)
--- a/app/controllers/user_blocks_controller.rb
+++ b/app/controllers/user_blocks_controller.rb
@@ -20,7 +20,7 @@ class UserBlocksController < ApplicationController
   end
 
   def show
   end
 
   def show

-    if current_user && current_user.id == @user_block.user_id
+    if current_user && current_user == @user_block.user

       @user_block.needs_view = false
       @user_block.save!
     end
       @user_block.needs_view = false
       @user_block.save!
     end


@@ -37,8 +37,8 @@ class UserBlocksController < ApplicationController
   def create
     if @valid_params
       @user_block = UserBlock.new(
   def create
     if @valid_params
       @user_block = UserBlock.new(

-        :user_id => @this_user.id,
-        :creator_id => current_user.id,
+        :user => @this_user,
+        :creator => current_user,

         :reason => params[:user_block][:reason],
         :ends_at => Time.now.getutc + @block_period.hours,
         :needs_view => params[:user_block][:needs_view]
         :reason => params[:user_block][:reason],
         :ends_at => Time.now.getutc + @block_period.hours,
         :needs_view => params[:user_block][:needs_view]


@@ -57,7 +57,7 @@ class UserBlocksController < ApplicationController
 
   def update
     if @valid_params
 
   def update
     if @valid_params

-      if @user_block.creator_id != current_user.id
+      if @user_block.creator != current_user

         flash[:error] = t("user_block.update.only_creator_can_edit")
         redirect_to :action => "edit"
       elsif @user_block.update_attributes(
         flash[:error] = t("user_block.update.only_creator_can_edit")
         redirect_to :action => "edit"
       elsif @user_block.update_attributes(