github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-18 20:03:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Can't remove user profile uploads.

Browse Source 
Follow up to 24347ace10.
This commit is contained in:
Guo Xiang Tan 2019-05-02 16:53:17 +08:00
parent ebca588fd0
commit d252dad4f0
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/services/user_updater.rb
View File

@ -55,12 +55,16 @@ class UserUpdater
user_profile.bio_raw = attributes.fetch(:bio_raw) { user_profile.bio_raw }
end
if upload = Upload.get_from_url(attributes[:profile_background_upload_url])
user_profile.upload_profile_background(upload)
if attributes[:profile_background_upload_url] == ""
user_profile.profile_background_upload_id = nil
elsif upload = Upload.get_from_url(attributes[:profile_background_upload_url])
user_profile.profile_background_upload_id = upload.id
end
if upload = Upload.get_from_url(attributes[:card_background_upload_url])
user_profile.upload_card_background(upload)
if attributes[:card_background_upload_url] == ""
user_profile.card_background_upload_id = nil
elsif upload = Upload.get_from_url(attributes[:card_background_upload_url])
user_profile.card_background_upload_id = upload.id
end
old_user_name = user.name.present? ? user.name : ""

11
spec/services/user_updater_spec.rb
View File

@ -184,6 +184,17 @@ describe UserUpdater do
expect(user.date_of_birth).to eq(date_of_birth.to_date)
expect(user.card_background_upload).to eq(upload1)
expect(user.profile_background_upload).to eq(upload2)
success = updater.update(
profile_background_upload_url: "",
card_background_upload_url: ""
)
user.reload
expect(success).to eq(true)
expect(user.card_background_upload).to eq(nil)
expect(user.profile_background_upload).to eq(nil)
end
it "disables email_digests when enabling mailing_list_mode" do