Merge remote-tracking branch 'upstream/pull/5143'

[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 2dcac3e8a3e118732e4ad4d0309601543701300c..6bf86de3fa6b0387379923aa7efce96cadd14cd1 100644 (file)
--- a/app/controllers/user_blocks_controller.rb
+++ b/app/controllers/user_blocks_controller.rb
@@ -1,145 +1,174 @@
 class UserBlocksController < ApplicationController
 class UserBlocksController < ApplicationController

-  layout 'site'
+  include UserMethods
+  include PaginationMethods

 
 

-  before_filter :authorize_web
-  before_filter :set_locale
-  before_filter :require_user, :only => [:new, :create, :edit, :delete]
-  before_filter :require_moderator, :only => [:new, :create, :edit, :delete]
+  layout "site"
+
+  before_action :authorize_web
+  before_action :set_locale
+
+  authorize_resource
+
+  before_action :lookup_user, :only => [:new, :create, :revoke_all, :blocks_on, :blocks_by]
+  before_action :lookup_user_block, :only => [:show, :edit, :update]
+  before_action :require_valid_params, :only => [:create, :update]
+  before_action :check_database_readable
+  before_action :check_database_writable, :only => [:create, :update, :revoke_all]

 
   def index
 
   def index

-    @user_blocks_pages, @user_blocks = paginate(:user_blocks,
-                                            :include => [:user, :moderator, :revoker],
-                                            :order => "user_blocks.end_at DESC",
-                                            :per_page => 20)
+    @params = params.permit
+
+    user_blocks = UserBlock.all
+
+    @user_blocks, @newer_user_blocks_id, @older_user_blocks_id = get_page_items(user_blocks, :includes => [:user, :creator, :revoker])
+
+    @show_user_name = true
+    @show_creator_name = true
+
+    render :partial => "blocks" if turbo_frame_request_id == "pagination"

   end
 
   def show
   end
 
   def show

-    @user_block = UserBlock.find(params[:id])
-
-    if @user and @user.id == @user_block.user_id
+    if current_user && current_user == @user_block.user

       @user_block.needs_view = false
       @user_block.needs_view = false

+      @user_block.deactivates_at = [@user_block.ends_at, Time.now.utc].max

       @user_block.save!
     end
   end
 
   def new
     @user_block = UserBlock.new
       @user_block.save!
     end
   end
 
   def new
     @user_block = UserBlock.new

-    @display_name = params[:display_name]
-    @this_user = User.find_by_display_name(@display_name, :conditions => {:visible => true})

   end
 
   end
 

-  # GET /user_blocks/1/edit

   def edit
   def edit

-    @user_block = UserBlock.find(params[:id])
-    params[:user_block_period] = ((@user_block.end_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

-    @display_name = params[:display_name]
-    @this_user = User.find_by_display_name(@display_name, :conditions => {:visible => true})
-    block_period = [UserBlock::PERIODS.max, params[:user_block_period].to_i].min
-
-    @user_block = UserBlock.new(:user_id => @this_user.id,
-                                :moderator_id => @user.id,
-                                :reason => params[:user_block][:reason],
-                                :end_at => Time.now.getutc() + block_period.hours,
-                                :needs_view => params[:user_block][:needs_view])
-    
-    if (@this_user and @user.moderator? and 
-        params[:tried_contacting] == "yes" and
-        params[:tried_waiting] == "yes" and
-        block_period >= 0)
+    if @valid_params
+      now = Time.now.utc
+      @user_block = UserBlock.new(
+        :user => @user,
+        :creator => current_user,
+        :reason => params[:user_block][:reason],
+        :created_at => now,
+        :ends_at => now + @block_period.hours,
+        :needs_view => params[:user_block][:needs_view]
+      )
+      @user_block.deactivates_at = @user_block.ends_at unless @user_block.needs_view
+

       if @user_block.save
       if @user_block.save

-        flash[:notice] = t('user_block.create.flash', :name => @display_name)
+        flash[:notice] = t(".flash", :name => @user.display_name)

         redirect_to @user_block
       else
         render :action => "new"
       end
     else
         redirect_to @user_block
       else
         render :action => "new"
       end
     else

-      if !@user.moderator?
-        flash[:notice] = t('user_block.create.not_a_moderator')
-      elsif params[:tried_contacting] != "yes"
-        flash[:notice] = t('user_block.create.try_contacting')
-      elsif params[:tried_waiting] != "yes"
-        flash[:notice] = t('user_block.create.try_waiting')
-      else
-        flash[:notice] = t('user_block.create.bad_parameters')
-      end
-      @display_name = @this_user.nil? ? '' : @this_user.display_name
-
-      render :action => "new"
+      redirect_to new_user_block_path(:display_name => params[:display_name])

     end
   end
 
   def update
     end
   end
 
   def update

-    @user_block = UserBlock.find(params[:id])
-    block_period = [72, params[:user_block_period].to_i].min
-    
-    if @user_block.moderator_id != @user.id
-      flash[:notice] = t('user_block.update.only_creator_can_edit')
-      redirect_to(@user_block)
-
-    elsif !@user_block.active?
-      flash[:notice] = t('user_block.update.block_expired')
-      redirect_to(@user_block)
-      
-    elsif @user_block.update_attributes({ :end_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')
-      redirect_to(@user_block)
+    if @valid_params
+      if cannot?(:update, @user_block)
+        flash[:error] = t(@user_block.revoker ? ".only_creator_or_revoker_can_edit" : ".only_creator_can_edit")
+        redirect_to :action => "edit"
+      else
+        user_block_was_active = @user_block.active?
+        @user_block.reason = params[:user_block][:reason]
+        @user_block.needs_view = params[:user_block][:needs_view]
+        @user_block.ends_at = Time.now.utc + @block_period.hours
+        @user_block.deactivates_at = (@user_block.ends_at unless @user_block.needs_view)
+        @user_block.revoker = current_user if user_block_was_active && !@user_block.active?
+        if user_block_was_active && @user_block.active? && current_user != @user_block.creator
+          flash.now[:error] = t(".only_creator_can_edit_without_revoking")
+          render :action => "edit"
+        elsif !user_block_was_active && @user_block.active?
+          flash.now[:error] = t(".inactive_block_cannot_be_reactivated")
+          render :action => "edit"
+        else
+          unless user_block_was_active
+            @user_block.ends_at = @user_block.ends_at_was
+            @user_block.deactivates_at = @user_block.deactivates_at_was
+            @user_block.deactivates_at = [@user_block.ends_at, @user_block.updated_at].max unless @user_block.deactivates_at # take updated_at into account before deactivates_at is backfilled
+          end
+          if @user_block.save
+            flash[:notice] = t(".success")
+            redirect_to @user_block
+          else
+            render :action => "edit"
+          end
+        end
+      end

     else
     else

-      render :action => "edit"
+      redirect_to edit_user_block_path(:id => params[:id])

     end
   end
 
   ##
     end
   end
 
   ##

-  # revokes the block, setting the end_time to now
-  def revoke
-    @user_block = UserBlock.find(params[:id])
-    
-    if !@user.moderator?
-      flash[:notice] = t('user_block.create.not_a_moderator')
-      redirect_to @user_block
-
-    elsif params[:confirm]
-      if @user_block.revoke!
-        flash[:notice] = t'user_block.revoke.flash'
-        redirect_to(@user_block)
-      else
-        flash[:notice] = t'user_block.revoke.error'
-        render :action => "edit"
-      end
+  # revokes all active blocks
+  def revoke_all
+    if request.post? && params[:confirm]
+      @user.blocks.active.each { |block| block.revoke!(current_user) }
+      flash[:notice] = t ".flash"
+      redirect_to user_blocks_on_path(@user)

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

-    @this_user = User.find_by_display_name(params[:display_name])
+    @params = params.permit(:display_name)
+
+    user_blocks = UserBlock.where(:user => @user)
+
+    @user_blocks, @newer_user_blocks_id, @older_user_blocks_id = get_page_items(user_blocks, :includes => [:user, :creator, :revoker])
+
+    @show_user_name = false
+    @show_creator_name = true

 
 

-    @user_blocks_pages, @user_blocks = paginate(:user_blocks,
-                                                :include => [:user, :moderator, :revoker],
-                                                :conditions => {:user_id => @this_user.id},
-                                                :order => "user_blocks.end_at DESC",
-                                                :per_page => 20)
+    render :partial => "blocks" if turbo_frame_request_id == "pagination"

   end
 
   ##
   # shows a list of all the blocks by the given user.
   def blocks_by
   end
 
   ##
   # shows a list of all the blocks by the given user.
   def blocks_by

-    @this_user = User.find_by_display_name(params[:display_name])
+    @params = params.permit(:display_name)

 
 

-    @user_blocks_pages, @user_blocks = paginate(:user_blocks,
-                                            :include => [:user, :moderator, :revoker],
-                                            :conditions => {:moderator_id => @this_user.id},
-                                            :order => "user_blocks.end_at DESC",
-                                            :per_page => 20)
+    user_blocks = UserBlock.where(:creator => @user)
+
+    @user_blocks, @newer_user_blocks_id, @older_user_blocks_id = get_page_items(user_blocks, :includes => [:user, :creator, :revoker])
+
+    @show_user_name = true
+    @show_creator_name = false
+
+    render :partial => "blocks" if turbo_frame_request_id == "pagination"

   end
 
   private
   end
 
   private

-  def require_moderator
-    redirect_to "/403.html" unless @user.moderator?
+
+  ##
+  # ensure that there is a "user_block" instance variable
+  def lookup_user_block
+    @user_block = UserBlock.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    render :action => "not_found", :status => :not_found

   end
 
   end
 

+  ##
+  # check that the input parameters are valid, setting an instance
+  # variable if not. note that this doesn't do any redirection, as it's
+  # called before two different actions, each of which should redirect
+  # to a different place.
+  def require_valid_params
+    @block_period = params[:user_block_period].to_i
+    @valid_params = false
+
+    if UserBlock::PERIODS.exclude?(@block_period)
+      flash[:error] = t("user_blocks.filter.block_period")
+
+    else
+      @valid_params = true
+    end
+  end

 end
 end