github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 06:29:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: User can't remove bookmark from a deleted post.

Browse Source
This commit is contained in:
Guo Xiang Tan 2017-05-19 12:24:49 +08:00
parent 870c584e25
commit 8ab9f30bbd
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/posts_controller.rb
View File

@ -383,9 +383,11 @@ class PostsController < ApplicationController
PostAction.act(current_user, post, PostActionType.types[:bookmark])
else
post_action = PostAction.find_by(post_id: params[:post_id], user_id: current_user.id)
post = post_action&.post
raise Discourse::NotFound unless post_action
post = Post.with_deleted.find_by(id: post_action&.post_id)
raise Discourse::NotFound unless post
PostAction.remove_act(current_user, post, PostActionType.types[:bookmark])
end

11
spec/controllers/posts_controller_spec.rb
View File

@ -476,6 +476,17 @@ describe PostsController do
expect(PostAction.find_by(id: post_action.id)).to eq(nil)
end
end
describe "when post has been deleted" do
it "should still be able to remove a bookmark" do
post = post_action.post
post.trash!
xhr :put, :bookmark, post_id: post.id
expect(PostAction.find_by(id: post_action.id)).to eq(nil)
end
end
end
end