From 7c45243d168e65abd992d12a10fdd5691e252c44 Mon Sep 17 00:00:00 2001 From: albert Date: Mon, 14 Mar 2011 14:11:45 -0400 Subject: [PATCH] minor moderation fixes --- app/controllers/post_moderation_controller.rb | 2 +- app/models/post.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/post_moderation_controller.rb b/app/controllers/post_moderation_controller.rb index 81441aec5..8c0d060e0 100644 --- a/app/controllers/post_moderation_controller.rb +++ b/app/controllers/post_moderation_controller.rb @@ -4,7 +4,7 @@ class PostModerationController < ApplicationController rescue_from Post::DisapprovalError, :with => :disapproval_error def moderate - @search = Post.order("id asc").pending.available_for_moderation.search(:tag_match => params[:query]) + @search = Post.order("id asc").pending_or_flagged.available_for_moderation.search(:tag_match => params[:query]) @posts = @search.paginate(:page => params[:page]) respond_to do |format| format.html diff --git a/app/models/post.rb b/app/models/post.rb index d92e79ac4..5ec5ee21f 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -28,6 +28,7 @@ class Post < ActiveRecord::Base validate :validate_parent_does_not_have_a_parent attr_accessible :source, :rating, :tag_string, :old_tag_string, :last_noted_at scope :pending, where(["is_pending = ?", true]) + scope :pending_or_flagged, where(["(is_pending = ? OR is_flagged = ?)", true, true]) scope :undeleted, where(["is_deleted = ?", false]) scope :visible, lambda {|user| Danbooru.config.can_user_see_post_conditions(user)} scope :commented_before, lambda {|date| where("last_commented_at < ?", date).order("last_commented_at DESC")}