aliases/implications: don't destroy removed aliases (#4024).

This commit is contained in:
evazion
2018-12-31 17:07:14 -06:00
parent f5116c5ce2
commit d393d67a9b
7 changed files with 36 additions and 10 deletions

View File

@@ -188,11 +188,10 @@ class TagAlias < TagRelationship
end
end
def reject!
def reject!(update_topic: true)
update(status: "deleted")
clear_all_cache
forum_updater.update(reject_message(CurrentUser.user), "REJECTED")
destroy
forum_updater.update(reject_message(CurrentUser.user), "REJECTED") if update_topic
end
def wiki_pages_present

View File

@@ -169,10 +169,9 @@ class TagImplication < TagRelationship
delay(:queue => "default").process!(update_topic: update_topic)
end
def reject!
def reject!(update_topic: true)
update(status: "deleted")
forum_updater.update(reject_message(CurrentUser.user), "REJECTED")
destroy
forum_updater.update(reject_message(CurrentUser.user), "REJECTED") if update_topic
end
def create_mod_action

View File

@@ -16,6 +16,7 @@ class TagRelationship < ApplicationRecord
has_one :consequent_wiki, through: :consequent_tag, source: :wiki_page
scope :active, ->{where(status: "active")}
scope :deleted, ->{where(status: "deleted")}
scope :expired, ->{where("created_at < ?", EXPIRY.days.ago)}
scope :old, ->{where("created_at >= ? and created_at < ?", EXPIRY.days.ago, EXPIRY_WARNING.days.ago)}
scope :pending, ->{where(status: "pending")}