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
@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"
- elsif @user_block.save
- flash[:notice] = t(".success")
- redirect_to @user_block
else
- render :action => "edit"
+ @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
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
##
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