Allow deletion of avatars
This commit is contained in:
parent
d1175870c2
commit
8836532664
|
@ -32,7 +32,7 @@ class UsersController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
if @user.update(existing_user_params)
|
if existing_user_params.present? && @user.update(existing_user_params)
|
||||||
redirect_to @user, notice: t(".success")
|
redirect_to @user, notice: t(".success")
|
||||||
else
|
else
|
||||||
flash.now[:alert] = t(".error")
|
flash.now[:alert] = t(".error")
|
||||||
|
@ -59,6 +59,7 @@ class UsersController < ApplicationController
|
||||||
:last_name,
|
:last_name,
|
||||||
:profile,
|
:profile,
|
||||||
:avatar,
|
:avatar,
|
||||||
|
:delete_avatar,
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
module DeletableAttachments
|
||||||
|
extend ActiveSupport::Concern
|
||||||
|
|
||||||
|
included do
|
||||||
|
before_save :delete_attachments
|
||||||
|
|
||||||
|
def delete_attachments
|
||||||
|
attachment_reflections.each do |reflection, _|
|
||||||
|
if send("delete_#{reflection}")
|
||||||
|
send(reflection).purge
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
class_methods do
|
||||||
|
def deletable_attachments(*attachments)
|
||||||
|
attachments.each do |attachment|
|
||||||
|
attribute "delete_#{attachment}", :boolean, default: false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -1,6 +1,9 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class User < ApplicationRecord
|
class User < ApplicationRecord
|
||||||
|
include DeletableAttachments
|
||||||
|
deletable_attachments :avatar
|
||||||
|
|
||||||
has_and_belongs_to_many :site_roles
|
has_and_belongs_to_many :site_roles
|
||||||
has_many :owned_tables, foreign_key: :owner_id, class_name: "Table"
|
has_many :owned_tables, foreign_key: :owner_id, class_name: "Table"
|
||||||
has_many :players, dependent: :destroy
|
has_many :players, dependent: :destroy
|
||||||
|
|
|
@ -35,6 +35,9 @@
|
||||||
<hr>
|
<hr>
|
||||||
|
|
||||||
<% if user.persisted? %>
|
<% if user.persisted? %>
|
||||||
|
<%= f.label :delete_avatar %>
|
||||||
|
<%= f.check_box :delete_avatar %>
|
||||||
|
|
||||||
<%= f.label :avatar %>
|
<%= f.label :avatar %>
|
||||||
<%= f.file_field :avatar %>
|
<%= f.file_field :avatar %>
|
||||||
<%= display_form_errors(user, :avatar) %>
|
<%= display_form_errors(user, :avatar) %>
|
||||||
|
|
|
@ -52,6 +52,15 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
|
||||||
assert_redirected_to user_path(users(:trevor))
|
assert_redirected_to user_path(users(:trevor))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "can delete avatar" do
|
||||||
|
user = users(:trevor)
|
||||||
|
assert user.avatar.attached?
|
||||||
|
|
||||||
|
sign_in users(:trevor)
|
||||||
|
patch(user_url(user), params: { user: { delete_avatar: "1" } })
|
||||||
|
assert_not user.reload.avatar.attached?
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def user_params
|
def user_params
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
trevor_avatar:
|
||||||
|
name: avatar
|
||||||
|
record: trevor (User)
|
||||||
|
blob: trevor_avatar_blob
|
|
@ -0,0 +1 @@
|
||||||
|
trevor_avatar_blob: <%= ActiveStorage::FixtureSet.blob(filename: "trevor.png", service_name: "test") %>
|
Binary file not shown.
After Width: | Height: | Size: 329 KiB |
Loading…
Reference in New Issue