diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 1298ece..1bc8967 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -32,7 +32,7 @@ class UsersController < ApplicationController end def update - if @user.update(existing_user_params) + if existing_user_params.present? && @user.update(existing_user_params) redirect_to @user, notice: t(".success") else flash.now[:alert] = t(".error") @@ -59,6 +59,7 @@ class UsersController < ApplicationController :last_name, :profile, :avatar, + :delete_avatar, ) end diff --git a/app/models/concerns/deletable_attachments.rb b/app/models/concerns/deletable_attachments.rb new file mode 100644 index 0000000..472d00c --- /dev/null +++ b/app/models/concerns/deletable_attachments.rb @@ -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 diff --git a/app/models/user.rb b/app/models/user.rb index efe6fd9..14d76f7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,6 +1,9 @@ # frozen_string_literal: true class User < ApplicationRecord + include DeletableAttachments + deletable_attachments :avatar + has_and_belongs_to_many :site_roles has_many :owned_tables, foreign_key: :owner_id, class_name: "Table" has_many :players, dependent: :destroy diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb index fb0e3cf..0108f5f 100644 --- a/app/views/users/_form.html.erb +++ b/app/views/users/_form.html.erb @@ -35,6 +35,9 @@