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

added post flag test

Browse Source
This commit is contained in:
albert
2011-03-30 14:13:42 -04:00
parent 5856b105f5
commit a871b425f6
36 changed files with 214 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/post.rb
View File

@@ -216,7 +216,7 @@ class Post < ActiveRecord::Base
module ApprovalMethods
def is_approvable?
(is_pending? || is_flagged?) && approver_string != "approver:#{CurrentUser.name}"
(is_pending? || is_flagged? || is_deleted?) && approver_string != "approver:#{CurrentUser.name}"
end
def flag!(reason)
@@ -240,8 +240,10 @@ class Post < ActiveRecord::Base
def approve!
raise ApprovalError.new("You have previously approved this post and cannot approve it again") if approver_string == "approver:#{CurrentUser.name}"
flags.each {|x| x.resolve!}
self.is_flagged = false
self.is_pending = false
self.is_deleted = false
self.approver_string = "approver:#{CurrentUser.name}"
save!
end