jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#2250 fix validations not allowing empty topic id

Browse Source
This commit is contained in:
Toks
2014-08-23 20:01:56 -04:00
parent c5cabe4e58
commit 13101e7c88
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/forum_post.rb
View File

@@ -11,8 +11,9 @@ class ForumPost < ActiveRecord::Base
after_create :update_topic_updated_at_on_create
after_update :update_topic_updated_at_on_update_for_original_posts
after_destroy :update_topic_updated_at_on_destroy
validates_presence_of :body, :creator_id, :topic
validates_presence_of :body, :creator_id
validate :validate_topic_is_unlocked
validate :topic_id_not_invalid
before_destroy :validate_topic_is_unlocked
after_save :delete_topic_if_original_post
after_save :update_email_notifications
@@ -104,6 +105,12 @@ class ForumPost < ActiveRecord::Base
end
end
def topic_id_not_invalid
if topic_id && !topic
errors.add(:base, "Topic ID is invalid")
end
end
def editable_by?(user)
creator_id == user.id || user.is_janitor?
end