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

FIX: Changing owner of small action post failed

Browse Source 
Small action posts for invites (CC from email) have a blank raw and revising of posts with blank raw didn't work anymore.
This commit is contained in:
Gerhard Schlager 2019-01-19 13:38:25 +01:00
parent 502b1316d0
commit f8ded9cec9
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/post_revisor.rb
View File

@ -121,8 +121,6 @@ class PostRevisor
@topic_changes = TopicChanges.new(@topic, editor) @topic_changes = TopicChanges.new(@topic, editor)
return false if @fields.has_key?(:raw) && @fields[:raw].blank?
# some normalization # some normalization
@fields[:raw] = cleanup_whitespaces(@fields[:raw]) if @fields.has_key?(:raw) @fields[:raw] = cleanup_whitespaces(@fields[:raw]) if @fields.has_key?(:raw)
@fields[:user_id] = @fields[:user_id].to_i if @fields.has_key?(:user_id) @fields[:user_id] = @fields[:user_id].to_i if @fields.has_key?(:user_id)
@ -207,7 +205,7 @@ class PostRevisor
end end
def cleanup_whitespaces(raw) def cleanup_whitespaces(raw)
TextCleaner.normalize_whitespaces(raw).gsub(/\s+\z/, "") raw.present? ? TextCleaner.normalize_whitespaces(raw).gsub(/\s+\z/, "") : ""
end end
def should_revise? def should_revise?

14
spec/services/user_merger_spec.rb
View File

@ -36,19 +36,31 @@ describe UserMerger do
end end
it "changes owner of personal messages" do it "changes owner of personal messages" do
pm_topic = Fabricate(:private_message_topic) pm_topic = Fabricate(:private_message_topic, topic_allowed_users: [
Fabricate.build(:topic_allowed_user, user: target_user),
Fabricate.build(:topic_allowed_user, user: walter),
Fabricate.build(:topic_allowed_user, user: source_user)
])
post1 = Fabricate(:post, topic: pm_topic, user: source_user) post1 = Fabricate(:post, topic: pm_topic, user: source_user)
post2 = Fabricate(:post, topic: pm_topic, user: walter) post2 = Fabricate(:post, topic: pm_topic, user: walter)
post3 = Fabricate(:post, topic: pm_topic, user: target_user) post3 = Fabricate(:post, topic: pm_topic, user: target_user)
post4 = Fabricate(:post, topic: pm_topic, user: source_user, deleted_at: Time.now) post4 = Fabricate(:post, topic: pm_topic, user: source_user, deleted_at: Time.now)
small1 = pm_topic.add_small_action(source_user, "invited_user", "carol")
small2 = pm_topic.add_small_action(target_user, "invited_user", "david")
small3 = pm_topic.add_small_action(walter, "invited_user", "eve")
merge_users! merge_users!
expect(post1.reload.user).to eq(target_user) expect(post1.reload.user).to eq(target_user)
expect(post2.reload.user).to eq(walter) expect(post2.reload.user).to eq(walter)
expect(post3.reload.user).to eq(target_user) expect(post3.reload.user).to eq(target_user)
expect(post4.reload.user).to eq(target_user) expect(post4.reload.user).to eq(target_user)
expect(small1.reload.user).to eq(target_user)
expect(small2.reload.user).to eq(target_user)
expect(small3.reload.user).to eq(walter)
end end
it "changes owner of categories" do it "changes owner of categories" do