techhub/mastodon
2
0
Fork 0
Code Activity

Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)

Browse Source
This commit is contained in:
Emelia Smith
2018-04-02 13:45:07 +02:00
committed by Eugen Rochko
parent 4fd71accd4
commit e7a1716701
6 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/admin/accounts_controller.rb
View File

@@ -2,7 +2,7 @@
module Admin
class AccountsController < BaseController
before_action :set_account, only: [:show, :subscribe, :unsubscribe, :redownload, :enable, :disable, :memorialize]
before_action :set_account, only: [:show, :subscribe, :unsubscribe, :redownload, :remove_avatar, :enable, :disable, :memorialize]
before_action :require_remote_account!, only: [:subscribe, :unsubscribe, :redownload]
before_action :require_local_account!, only: [:enable, :disable, :memorialize]
@@ -60,6 +60,17 @@ module Admin
redirect_to admin_account_path(@account.id)
end
def remove_avatar
authorize @account, :remove_avatar?
@account.avatar = nil
@account.save!
log_action :remove_avatar, @account.user
redirect_to admin_account_path(@account.id)
end
private
def set_account