mirror of
https://github.com/discourse/discourse.git
synced 2025-05-30 15:28:37 +08:00
remove acts_as_paranoid, use .trash! , .recover! and .with_deleted as needed
makes upgrading to rails 4 possible
This commit is contained in:
@ -33,7 +33,7 @@ class InvitesController < ApplicationController
|
||||
|
||||
invite = Invite.where(invited_by_id: current_user.id, email: params[:email]).first
|
||||
raise Discourse::InvalidParameters.new(:email) if invite.blank?
|
||||
invite.destroy
|
||||
invite.trash!
|
||||
|
||||
render nothing: true
|
||||
end
|
||||
|
@ -128,7 +128,7 @@ class PostsController < ApplicationController
|
||||
def recover
|
||||
post = find_post_from_params
|
||||
guardian.ensure_can_recover_post!(post)
|
||||
post.recover
|
||||
post.recover!
|
||||
render nothing: true
|
||||
end
|
||||
|
||||
|
@ -100,7 +100,7 @@ class TopicsController < ApplicationController
|
||||
def destroy
|
||||
topic = Topic.where(id: params[:id]).first
|
||||
guardian.ensure_can_delete!(topic)
|
||||
topic.destroy
|
||||
topic.trash!
|
||||
render nothing: true
|
||||
end
|
||||
|
||||
|
Reference in New Issue
Block a user