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

Merge pull request #2806 from evazion/fix-post-appeal-is-deleted

Browse Source 
Fix `undefined method `is_deleted?' for nil` on /post_appeals.
This commit is contained in:
Albert Yi
2016-12-28 11:10:14 -08:00
committed by GitHub
parent 3eaa4cb0f1 8d714820a4
commit 92c1a561e0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/post_appeal.rb
View File

@@ -3,7 +3,7 @@ class PostAppeal < ActiveRecord::Base
belongs_to :creator, :class_name => "User" belongs_to :creator, :class_name => "User"
belongs_to :post belongs_to :post
validates_presence_of :reason, :creator_id, :creator_ip_addr validates_presence_of :post, :reason, :creator_id, :creator_ip_addr
validate :validate_post_is_inactive validate :validate_post_is_inactive
validate :validate_creator_is_not_limited validate :validate_creator_is_not_limited
before_validation :initialize_creator, :on => :create before_validation :initialize_creator, :on => :create
@@ -69,7 +69,7 @@ class PostAppeal < ActiveRecord::Base
extend SearchMethods extend SearchMethods
def resolved? def resolved?
!post.is_deleted? && !post.is_flagged? post.present? && !post.is_deleted? && !post.is_flagged?
end end
def is_resolved def is_resolved
@@ -86,7 +86,7 @@ class PostAppeal < ActiveRecord::Base
end end
def validate_post_is_inactive def validate_post_is_inactive
if !post.is_deleted? && !post.is_flagged? if resolved?
errors[:post] << "is active" errors[:post] << "is active"
false false
else else