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

[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 6bf86de3fa6b0387379923aa7efce96cadd14cd1..d427e5fa515bee1b2a4454cc1b1624a112d794cf 100644 (file)
--- a/app/controllers/user_blocks_controller.rb
+++ b/app/controllers/user_blocks_controller.rb
@@ -25,11 +25,11 @@ class UserBlocksController < ApplicationController
     @show_user_name = true
     @show_creator_name = true
 
     @show_user_name = true
     @show_creator_name = true
 

-    render :partial => "blocks" if turbo_frame_request_id == "pagination"
+    render :partial => "page" if turbo_frame_request_id == "pagination"

   end
 
   def show
   end
 
   def show

-    if current_user && current_user == @user_block.user
+    if current_user && current_user == @user_block.user && !@user_block.deactivates_at

       @user_block.needs_view = false
       @user_block.deactivates_at = [@user_block.ends_at, Time.now.utc].max
       @user_block.save!
       @user_block.needs_view = false
       @user_block.deactivates_at = [@user_block.ends_at, Time.now.utc].max
       @user_block.save!


@@ -71,7 +71,7 @@ class UserBlocksController < ApplicationController
   def update
     if @valid_params
       if cannot?(:update, @user_block)
   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")
+        flash[:error] = @user_block.revoker ? t(".only_creator_or_revoker_can_edit") : t(".only_creator_can_edit")

         redirect_to :action => "edit"
       else
         user_block_was_active = @user_block.active?
         redirect_to :action => "edit"
       else
         user_block_was_active = @user_block.active?


@@ -127,7 +127,7 @@ class UserBlocksController < ApplicationController
     @show_user_name = false
     @show_creator_name = true
 
     @show_user_name = false
     @show_creator_name = true
 

-    render :partial => "blocks" if turbo_frame_request_id == "pagination"
+    render :partial => "page" if turbo_frame_request_id == "pagination"

   end
 
   ##
   end
 
   ##


@@ -142,7 +142,7 @@ class UserBlocksController < ApplicationController
     @show_user_name = true
     @show_creator_name = false
 
     @show_user_name = true
     @show_creator_name = false
 

-    render :partial => "blocks" if turbo_frame_request_id == "pagination"
+    render :partial => "page" if turbo_frame_request_id == "pagination"

   end
 
   private
   end
 
   private