From eb0872c5d4b8b29fdbfe941b164374f9f6bfdc95 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Sun, 11 May 2014 15:53:57 -0400 Subject: [PATCH] FIX: Topic archetype check should only happen when the topic exists --- app/models/topic_link.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb index 803444240df..87455435e4d 100644 --- a/app/models/topic_link.rb +++ b/app/models/topic_link.rb @@ -45,7 +45,7 @@ class TopicLink < ActiveRecord::Base builder.where('ftl.topic_id = :topic_id', topic_id: topic_id) builder.where('ft.deleted_at IS NULL') - builder.where('ft.archetype <> :archetype', archetype: Archetype.private_message) + builder.where("COALESCE(ft.archetype, 'regular') <> :archetype", archetype: Archetype.private_message) builder.secure_category(guardian.secure_category_ids) @@ -73,7 +73,7 @@ class TopicLink < ActiveRecord::Base ORDER BY reflection ASC, clicks DESC") builder.where('t.deleted_at IS NULL') - builder.where('t.archetype <> :archetype', archetype: Archetype.private_message) + builder.where("COALESCE(t.archetype, 'regular') <> :archetype", archetype: Archetype.private_message) # not certain if pluck is right, cause it may interfere with caching builder.where('l.post_id IN (:post_ids)', post_ids: posts.map(&:id))