Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Topic archetype check should only happen when the topic exists

This commit is contained in:
Robin Ward 2014-05-11 15:53:57 -04:00
parent 948ebf2201
commit eb0872c5d4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/topic_link.rb
View File

@ -45,7 +45,7 @@ class TopicLink < ActiveRecord::Base
builder.where('ftl.topic_id = :topic_id', topic_id: topic_id) builder.where('ftl.topic_id = :topic_id', topic_id: topic_id)
builder.where('ft.deleted_at IS NULL') 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) builder.secure_category(guardian.secure_category_ids)
@ -73,7 +73,7 @@ class TopicLink < ActiveRecord::Base
ORDER BY reflection ASC, clicks DESC") ORDER BY reflection ASC, clicks DESC")
builder.where('t.deleted_at IS NULL') 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 # 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)) builder.where('l.post_id IN (:post_ids)', post_ids: posts.map(&:id))