deblan/journalduhacker
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix tag filtering

Browse source 
a story with tags [c, go] with a user's tag filter of [go] was just
removing the [go] tag from the story, not removing it from the list
completely
This commit is contained in:
joshua stein 2013-02-07 17:35:20 -06:00
parent 464b3c3f80
commit 95cdd886a1
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/controllers/home_controller.rb
View file

@ -124,6 +124,14 @@ private
conds.push user.id
end
filtered_tag_ids = []
if user
filtered_tag_ids = @user.tag_filters.map{|tf| tf.tag_id }
else
# for logged-out users, filter defaults
filtered_tag_ids = Tag.where(:filtered_by_default => true).map{|t| t.id }
end
if tag
conds[0] << "AND stories.id IN (SELECT taggings.story_id FROM " <<
"taggings WHERE taggings.tag_id = ?)"
@ -131,15 +139,11 @@ private
elsif by_user
conds[0] << "AND stories.user_id = ?"
conds.push by_user
elsif user
conds[0] += " AND taggings.tag_id NOT IN (SELECT tag_id FROM " <<
"tag_filters WHERE user_id = ?)"
conds.push @user.id
else
# for logged-out users, filter defaults
conds[0] += " AND taggings.tag_id NOT IN (SELECT id FROM " <<
"tags WHERE filtered_by_default = ?)"
conds.push true
elsif filtered_tag_ids.any?
conds[0] += " AND stories.id NOT IN (SELECT taggings.story_id " <<
"FROM taggings WHERE taggings.tag_id IN (" <<
filtered_tag_ids.map{|t| "?" }.join(",") << "))"
conds += filtered_tag_ids
end
stories = Story.find(