Story: inactive tags that are marked for destruction are ok

This commit is contained in:
joshua stein 2015-03-19 12:10:52 -05:00
parent 26f17ae928
commit e974083413

View file

@ -188,7 +188,7 @@ class Story < ActiveRecord::Base
if !t.tag.valid_for?(u)
raise "#{u.username} does not have permission to use privileged " <<
"tag #{t.tag.tag}"
elsif t.tag.inactive? && !t.new_record?
elsif t.tag.inactive? && !t.new_record? && !t.marked_for_destruction?
# stories can have inactive tags as long as they existed before
raise "#{u.username} cannot add inactive tag #{t.tag.tag}"
end