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

8
app/models/bulk_update_request.rb
View File

@@ -7,9 +7,9 @@ class BulkUpdateRequest < ActiveRecord::Base
validates_presence_of :user
validates_presence_of :script
validates_presence_of :title
validates_presence_of :forum_topic, :message => "is invalid"
validates_inclusion_of :status, :in => %w(pending approved rejected)
validate :script_formatted_correctly
validate :forum_topic_id_not_invalid
attr_accessible :user_id, :forum_topic_id, :script, :title, :reason
attr_accessible :status, :as => [:admin]
before_validation :initialize_attributes, :on => :create
@@ -85,4 +85,10 @@ class BulkUpdateRequest < ActiveRecord::Base
errors.add(:base, e.message)
return false
end
def forum_topic_id_not_invalid
if forum_topic_id && !forum_topic
errors.add(:base, "Forum topic ID is invalid")
end
end
end