diff --git a/app/controllers/post_appeals_controller.rb b/app/controllers/post_appeals_controller.rb index 139f46621..a99e0213a 100644 --- a/app/controllers/post_appeals_controller.rb +++ b/app/controllers/post_appeals_controller.rb @@ -8,7 +8,7 @@ class PostAppealsController < ApplicationController end def index - @query = PostAppeal.order("id desc").search(params[:search]) + @query = PostAppeal.order("id desc").includes(:post).search(params[:search]) @post_appeals = @query.paginate(params[:page], :limit => params[:limit]) respond_with(@post_appeals) do |format| format.xml do diff --git a/app/models/post_appeal.rb b/app/models/post_appeal.rb index 686b0c8d7..26081ade6 100644 --- a/app/models/post_appeal.rb +++ b/app/models/post_appeal.rb @@ -68,6 +68,10 @@ class PostAppeal < ActiveRecord::Base extend SearchMethods + def resolved? + !post.is_deleted? && !post.is_flagged? + end + def validate_creator_is_not_limited if appeal_count_for_creator >= Danbooru.config.max_appeals_per_day errors[:creator] << "can appeal at most #{Danbooru.config.max_appeals_per_day} post a day" diff --git a/app/views/post_appeals/index.html.erb b/app/views/post_appeals/index.html.erb index 6d8504b8d..bcb74545e 100644 --- a/app/views/post_appeals/index.html.erb +++ b/app/views/post_appeals/index.html.erb @@ -10,6 +10,7 @@