X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a9824dbc2e8763e6fff6f71db7a31cc4761cd245..79e2208fe39597d9475afdc8edcfc790af14b777:/app/controllers/user_blocks_controller.rb?ds=sidebyside

diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb
index e681a194a..6bf86de3f 100644
--- a/app/controllers/user_blocks_controller.rb
+++ b/app/controllers/user_blocks_controller.rb
@@ -1,26 +1,37 @@
 class UserBlocksController < ApplicationController
-  layout 'site'
-
-  before_filter :authorize_web
-  before_filter :set_locale
-  before_filter :require_user, :only => [:new, :create, :edit, :update, :revoke]
-  before_filter :require_moderator, :only => [:new, :create, :edit, :update, :revoke]
-  before_filter :lookup_this_user, :only => [:new, :create, :blocks_on, :blocks_by]
-  before_filter :lookup_user_block, :only => [:show, :edit, :update, :revoke]
-  before_filter :require_valid_params, :only => [:create, :update]
-  before_filter :check_database_readable
-  before_filter :check_database_writable, :only => [:create, :update, :revoke]
+  include UserMethods
+  include PaginationMethods
+
+  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
-    @user_blocks_pages, @user_blocks = paginate(:user_blocks,
-                                                :include => [:user, :creator, :revoker],
-                                                :order => "user_blocks.ends_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
-    if @user and @user.id == @user_block.user_id
+    if current_user && current_user == @user_block.user
       @user_block.needs_view = false
+      @user_block.deactivates_at = [@user_block.ends_at, Time.now.utc].max
       @user_block.save!
     end
   end
@@ -30,21 +41,24 @@ class UserBlocksController < ApplicationController
   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
-    if @valid_params 
-      @user_block = UserBlock.new({
-        :user_id => @this_user.id,
-        :creator_id => @user.id,
+    if @valid_params
+      now = Time.now.utc
+      @user_block = UserBlock.new(
+        :user => @user,
+        :creator => current_user,
         :reason => params[:user_block][:reason],
-        :ends_at => Time.now.getutc() + @block_period.hours,
+        :created_at => now,
+        :ends_at => now + @block_period.hours,
         :needs_view => params[:user_block][:needs_view]
-      }, :without_protection => true)
-    
+      )
+      @user_block.deactivates_at = @user_block.ends_at unless @user_block.needs_view
+
       if @user_block.save
-        flash[:notice] = t('user_block.create.flash', :name => @this_user.display_name)
+        flash[:notice] = t(".flash", :name => @user.display_name)
         redirect_to @user_block
       else
         render :action => "new"
@@ -54,20 +68,37 @@ class UserBlocksController < ApplicationController
     end
   end
 
-  def update  
-    if @valid_params 
-      if @user_block.creator_id != @user.id
-        flash[:error] = t('user_block.update.only_creator_can_edit')
+  def update
+    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"
-      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]
-            }, :without_protection => true)
-        flash[:notice] = t('user_block.update.success')
-        redirect_to(@user_block)
       else
-        render :action => "edit"
+        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
       redirect_to edit_user_block_path(:id => params[:id])
@@ -75,59 +106,47 @@ class UserBlocksController < ApplicationController
   end
 
   ##
-  # revokes the block, setting the end_time to now
-  def revoke
-    if params[:confirm]
-      if @user_block.revoke! @user
-        flash[:notice] = t'user_block.revoke.flash'
-        redirect_to(@user_block)
-      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
-    @user_blocks_pages, @user_blocks = paginate(:user_blocks,
-                                                :include => [:user, :creator, :revoker],
-                                                :conditions => {:user_id => @this_user.id},
-                                                :order => "user_blocks.ends_at DESC",
-                                                :per_page => 20)
+    @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
+
+    render :partial => "blocks" if turbo_frame_request_id == "pagination"
   end
 
   ##
   # shows a list of all the blocks by the given user.
   def blocks_by
-    @user_blocks_pages, @user_blocks = paginate(:user_blocks,
-                                                :include => [:user, :creator, :revoker],
-                                                :conditions => {:creator_id => @this_user.id},
-                                                :order => "user_blocks.ends_at DESC",
-                                                :per_page => 20)
-  end
+    @params = params.permit(:display_name)
 
-  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
+    user_blocks = UserBlock.where(:creator => @user)
 
-  ##
-  # 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
+    @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
+
   ##
   # ensure that there is a "user_block" instance variable
   def lookup_user_block
@@ -145,15 +164,11 @@ class UserBlocksController < ApplicationController
     @block_period = params[:user_block_period].to_i
     @valid_params = false
 
-    if !UserBlock::PERIODS.include?(@block_period)
-      flash[:error] = t('user_block.filter.block_period')
-      
-    elsif @user_block and !@user_block.active?
-      flash[:error] = t('user_block.filter.block_expired')
-      
+    if UserBlock::PERIODS.exclude?(@block_period)
+      flash[:error] = t("user_blocks.filter.block_period")
+
     else
       @valid_params = true
     end
   end
-
 end