Create an empty revoke all blocks page

[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 63ebdad713b85f5b54785c5d8169a611f89d57dc..bf61f906b30de4f9a640d8bb18cae40b12ea1d3b 100644 (file)
--- a/app/controllers/user_blocks_controller.rb
+++ b/app/controllers/user_blocks_controller.rb
@@ -1,4 +1,6 @@
 class UserBlocksController < ApplicationController
 class UserBlocksController < ApplicationController

+  include UserMethods
+

   layout "site"
 
   before_action :authorize_web
   layout "site"
 
   before_action :authorize_web


@@ -37,11 +39,13 @@ class UserBlocksController < ApplicationController
 
   def create
     if @valid_params
 
   def create
     if @valid_params

+      now = Time.now.utc

       @user_block = UserBlock.new(
         :user => @user,
         :creator => current_user,
         :reason => params[:user_block][:reason],
       @user_block = UserBlock.new(
         :user => @user,
         :creator => current_user,
         :reason => params[:user_block][:reason],

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

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


@@ -85,6 +89,12 @@ class UserBlocksController < ApplicationController
     end
   end
 
     end
   end
 

+  ##
+  # revokes all active blocks
+  def revoke_all
+    # TODO revoke
+  end
+

   ##
   # shows a list of all the blocks on the given user
   def blocks_on
   ##
   # shows a list of all the blocks on the given user
   def blocks_on