Use turbo for pagination

[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 664ac56815d6e541de2de2e839b04aa188867f38..167223d919f001147d54598b115e95d7884d04e6 100644 (file)
--- a/app/controllers/user_blocks_controller.rb
+++ b/app/controllers/user_blocks_controller.rb
@@ -21,6 +21,11 @@ class UserBlocksController < ApplicationController
     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
@@ -67,15 +72,24 @@ class UserBlocksController < ApplicationController
          current_user != @user_block.revoker
         flash[:error] = t(@user_block.revoker ? ".only_creator_or_revoker_can_edit" : ".only_creator_can_edit")
         redirect_to :action => "edit"
-      elsif @user_block.update(
-        :ends_at => Time.now.utc + @block_period.hours,
-        :reason => params[:user_block][:reason],
-        :needs_view => params[:user_block][:needs_view]
-      )
-        flash[:notice] = t(".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.revoker = current_user if user_block_was_active && !@user_block.active?
+        if !user_block_was_active && @user_block.active?
+          flash.now[:error] = t(".inactive_block_cannot_be_reactivated")
+          render :action => "edit"
+        else
+          @user_block.ends_at = @user_block.ends_at_was unless user_block_was_active
+          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])
@@ -109,6 +123,11 @@ class UserBlocksController < ApplicationController
     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
 
   ##
@@ -119,6 +138,11 @@ class UserBlocksController < ApplicationController
     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