From e8e87c96217a764bedb57039e883514214199fe2 Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 20 Jul 2013 13:36:14 -0400 Subject: [PATCH] Add tag search[has_wiki] parameter fixes #1870 --- app/models/tag.rb | 6 ++++++ app/views/tags/_search.html.erb | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/app/models/tag.rb b/app/models/tag.rb index 8add1ff7c..ae6dd2407 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -575,6 +575,12 @@ class Tag < ActiveRecord::Base q = q.where("post_count > 0") end + if params[:has_wiki] == "yes" + q = q.joins(:wiki_page) + elsif params[:has_wiki] == "no" + q = q.joins("LEFT JOIN wiki_pages ON tags.name = wiki_pages.title").where("wiki_pages.title IS NULL") + end + params[:order] ||= params.delete(:sort) case params[:order] when "name" diff --git a/app/views/tags/_search.html.erb b/app/views/tags/_search.html.erb index f94387e43..c2fd9772b 100644 --- a/app/views/tags/_search.html.erb +++ b/app/views/tags/_search.html.erb @@ -38,6 +38,15 @@ + + + +
+ <%= select "search", "has_wiki", ["yes", "no"], :selected => params[:search][:has_wiki], :include_blank => true %> +
+ + + <%= submit_tag "Search" %>