IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Use common path for RESTful DELETE action from upload image

Browse Source 
component
This commit is contained in:
Robin Ward
2014-06-27 14:48:39 -04:00
parent 3cbb32cc20
commit 9000c358d1
9 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/users_controller.rb
View File

@@ -7,7 +7,7 @@ class UsersController < ApplicationController
skip_before_filter :authorize_mini_profiler, only: [:avatar]
skip_before_filter :check_xhr, only: [:show, :password_reset, :update, :activate_account, :authorize_email, :user_preferences_redirect, :avatar, :my_redirect]
before_filter :ensure_logged_in, only: [:username, :update, :change_email, :user_preferences_redirect, :upload_user_image, :pick_avatar, :clear_profile_background, :destroy]
before_filter :ensure_logged_in, only: [:username, :update, :change_email, :user_preferences_redirect, :upload_user_image, :pick_avatar, :destroy_user_image, :destroy]
before_filter :respond_to_suspicious_request, only: [:create]
# we need to allow account creation with bad CSRF tokens, if people are caching, the CSRF token on the
@@ -380,11 +380,16 @@ class UsersController < ApplicationController
render nothing: true
end
def clear_profile_background
def destroy_user_image
user = fetch_user_from_params
guardian.ensure_can_edit!(user)
user.user_profile.clear_profile_background
image_type = params.require(:image_type)
if image_type == 'profile_background'
user.user_profile.clear_profile_background
else
raise Discourse::InvalidParameters.new(:image_type)
end
render nothing: true
end