Skip to content

Commit

Permalink
Add admin ability to remove an user's header image (#9495)
Browse files Browse the repository at this point in the history
* Fix markup in admin/accounts/:id table for avatar

* Add admin ability to remove an user's header image
  • Loading branch information
ClearlyClaire authored and Gargron committed Dec 11, 2018
1 parent 720daa8 commit cf6ee4f
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 3 deletions.
13 changes: 12 additions & 1 deletion app/controllers/admin/accounts_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module Admin
class AccountsController < BaseController
before_action :set_account, only: [:show, :subscribe, :unsubscribe, :redownload, :remove_avatar, :enable, :disable, :memorialize]
before_action :set_account, only: [:show, :subscribe, :unsubscribe, :redownload, :remove_avatar, :remove_header, :enable, :disable, :memorialize]
before_action :require_remote_account!, only: [:subscribe, :unsubscribe, :redownload]
before_action :require_local_account!, only: [:enable, :disable, :memorialize]

Expand Down Expand Up @@ -71,6 +71,17 @@ def remove_avatar
redirect_to admin_account_path(@account.id)
end

def remove_header
authorize @account, :remove_header?

@account.header = nil
@account.save!

log_action :remove_header, @account.user

redirect_to admin_account_path(@account.id)
end

private

def set_account
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/admin/action_logs_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def class_for_log_icon(log)
opposite_verbs?(log) ? 'negative' : 'positive'
when :update, :reset_password, :disable_2fa, :memorialize, :change_email
'neutral'
when :demote, :silence, :disable, :suspend, :remove_avatar, :reopen
when :demote, :silence, :disable, :suspend, :remove_avatar, :remove_header, :reopen
'negative'
when :destroy
opposite_verbs?(log) ? 'positive' : 'negative'
Expand Down
4 changes: 4 additions & 0 deletions app/policies/account_policy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ def remove_avatar?
staff?
end

def remove_header?
staff?
end

def subscribe?
admin?
end
Expand Down
9 changes: 8 additions & 1 deletion app/views/admin/accounts/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,18 @@

%tr
%th= t('admin.accounts.avatar')
%th
%td
= link_to @account.avatar.url(:original) do
= image_tag @account.avatar.url(:original), alt: '', width: 40, height: 40, class: 'avatar'
- if @account.local? && @account.avatar?
= table_link_to 'trash', t('admin.accounts.remove_avatar'), remove_avatar_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:remove_avatar, @account)
%tr
%th= t('admin.accounts.header')
%td
= link_to @account.header.url(:original) do
= image_tag @account.header.url(:original), alt: '', width: 128, height: 40, class: 'header'
- if @account.local? && @account.header?
= table_link_to 'trash', t('admin.accounts.remove_header'), remove_header_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:remove_header, @account)

- if @account.local?
%tr
Expand Down
1 change: 1 addition & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@
post :disable
post :redownload
post :remove_avatar
post :remove_header
post :memorialize
end

Expand Down

0 comments on commit cf6ee4f

Please sign in to comment.