From c6cf19b390f9b18655982bb925c12fb86fb1203e Mon Sep 17 00:00:00 2001 From: Toks Date: Sun, 4 Aug 2013 11:57:27 -0400 Subject: [PATCH] Add resolved search for appeals fixes #1258 --- app/models/post_appeal.rb | 14 ++++++++++++++ app/views/post_appeals/_search.html.erb | 11 ++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/app/models/post_appeal.rb b/app/models/post_appeal.rb index f44b3f6e5..718d61069 100644 --- a/app/models/post_appeal.rb +++ b/app/models/post_appeal.rb @@ -10,6 +10,14 @@ class PostAppeal < ActiveRecord::Base validates_uniqueness_of :creator_id, :scope => :post_id, :message => "have already appealed this post" module SearchMethods + def resolved + joins(:post).where("posts.is_deleted = false and posts.is_flagged = false") + end + + def unresolved + joins(:post).where("posts.is_deleted = true or posts.is_flagged = true") + end + def for_user(user_id) where("creator_id = ?", user_id) end @@ -34,6 +42,12 @@ class PostAppeal < ActiveRecord::Base q = q.where("post_id = ?", params[:post_id].to_i) end + if params[:is_resolved] == "true" + q = q.resolved + elsif params[:is_resolved] == "false" + q = q.unresolved + end + q end end diff --git a/app/views/post_appeals/_search.html.erb b/app/views/post_appeals/_search.html.erb index b18b08298..d87d0667b 100644 --- a/app/views/post_appeals/_search.html.erb +++ b/app/views/post_appeals/_search.html.erb @@ -1,6 +1,6 @@ - <%= form_tag(post_flags_path, :method => :get, :class => "simple_form") do %> + <%= form_tag(post_appeals_path, :method => :get, :class => "simple_form") do %> + + + + +