Don't show category descriptions as suggested topics
This commit is contained in:
parent
574a8c92c4
commit
bcfbacec16
|
@ -7,6 +7,7 @@ class SuggestedTopicsBuilder
|
||||||
def initialize(topic)
|
def initialize(topic)
|
||||||
@excluded_topic_ids = [topic.id]
|
@excluded_topic_ids = [topic.id]
|
||||||
@category_id = topic.category_id
|
@category_id = topic.category_id
|
||||||
|
@category_topic_ids = Category.pluck(:topic_id).compact
|
||||||
@results = []
|
@results = []
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -20,6 +21,7 @@ class SuggestedTopicsBuilder
|
||||||
results = results.where('topics.id NOT IN (?)', @excluded_topic_ids)
|
results = results.where('topics.id NOT IN (?)', @excluded_topic_ids)
|
||||||
.where(closed: false, archived: false, visible: true)
|
.where(closed: false, archived: false, visible: true)
|
||||||
.to_a
|
.to_a
|
||||||
|
.reject { |topic| @category_topic_ids.include?(topic.id) }
|
||||||
|
|
||||||
unless results.empty?
|
unless results.empty?
|
||||||
# Keep track of the ids we've added
|
# Keep track of the ids we've added
|
||||||
|
|
|
@ -90,6 +90,17 @@ describe SuggestedTopicsBuilder do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context "category definition topics" do
|
||||||
|
let!(:category) { Fabricate(:category) }
|
||||||
|
|
||||||
|
it "doesn't add a category definition topic" do
|
||||||
|
category.topic_id.should be_present
|
||||||
|
builder.add_results(Topic)
|
||||||
|
builder.size.should == 0
|
||||||
|
builder.should_not be_full
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue