IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 01:16:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: change topic creator wasn't removing the topic from the previous creator's activity stream

Browse Source
This commit is contained in:
Neil Lalonde 2015-05-29 17:39:24 -04:00
parent 548707ba14
commit 3a67c02c7a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/post_revisor.rb
View File

@ -199,7 +199,7 @@ class PostRevisor
create_or_update_revision
end
USER_ACTIONS_TO_REMOVE ||= [UserAction::NEW_TOPIC, UserAction::REPLY, UserAction::RESPONSE]
USER_ACTIONS_TO_REMOVE ||= [UserAction::REPLY, UserAction::RESPONSE]
def update_post
if @fields.has_key?("user_id") && @fields["user_id"] != @post.user_id
@ -207,10 +207,18 @@ class PostRevisor
new_owner = User.find(@fields["user_id"])
# UserActionObserver will create new UserAction records for the new owner
UserAction.where(target_post_id: @post.id)
.where(user_id: prev_owner.id)
.where(action_type: USER_ACTIONS_TO_REMOVE)
.destroy_all
if @post.post_number == 1
UserAction.where(target_topic_id: @post.topic_id)
.where(user_id: prev_owner.id)
.where(action_type: UserAction::NEW_TOPIC)
.destroy_all
end
end
POST_TRACKED_FIELDS.each do |field|

2
spec/services/post_owner_changer_spec.rb
View File

@ -47,7 +47,7 @@ describe PostOwnerChanger do
p2user.user_stat.update_attributes(topic_count: 0, post_count: 1, first_post_created_at: p2.created_at, topic_reply_count: 1)
UserAction.create!( action_type: UserAction::NEW_TOPIC, user_id: p1user.id, acting_user_id: p1user.id,
target_post_id: p1.id, target_topic_id: p1.topic_id, created_at: p1.created_at )
target_post_id: -1, target_topic_id: p1.topic_id, created_at: p1.created_at )
UserAction.create!( action_type: UserAction::REPLY, user_id: p2user.id, acting_user_id: p2user.id,
target_post_id: p2.id, target_topic_id: p2.topic_id, created_at: p2.created_at )