mirror of
https://github.com/discourse/discourse.git
synced 2024-11-25 10:20:58 -06:00
FIX: Suggested Topics had a hardcoded 5 and was ignoring the
SiteSetting
This commit is contained in:
parent
f5e6bcc585
commit
9929560c40
@ -107,22 +107,20 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
|
||||
debounceLoadSuggested: Discourse.debounce(function(){
|
||||
if (this.get('isDestroyed') || this.get('isDestroying')) { return; }
|
||||
|
||||
var incoming = this.get('topicTrackingState.newIncoming');
|
||||
var suggested = this.get('topic.details.suggested_topics');
|
||||
var topicId = this.get('topic.id');
|
||||
var incoming = this.get('topicTrackingState.newIncoming'),
|
||||
suggested = this.get('topic.details.suggested_topics'),
|
||||
topicId = this.get('topic.id');
|
||||
|
||||
if(suggested) {
|
||||
|
||||
var existing = _.invoke(suggested, 'get', 'id');
|
||||
|
||||
var lookup = _.chain(incoming)
|
||||
.last(5)
|
||||
.reverse()
|
||||
.union(existing)
|
||||
.uniq()
|
||||
.without(topicId)
|
||||
.first(5)
|
||||
.value();
|
||||
var existing = _.invoke(suggested, 'get', 'id'),
|
||||
lookup = _.chain(incoming)
|
||||
.last(Discourse.SiteSettings.suggested_topics)
|
||||
.reverse()
|
||||
.union(existing)
|
||||
.uniq()
|
||||
.without(topicId)
|
||||
.first(Discourse.SiteSettings.suggested_topics)
|
||||
.value();
|
||||
|
||||
Discourse.TopicList.loadTopics(lookup, "").then(function(topics){
|
||||
suggested.clear();
|
||||
|
@ -47,7 +47,9 @@ basic:
|
||||
posts_per_page:
|
||||
client: true
|
||||
default: 20
|
||||
suggested_topics: 5
|
||||
suggested_topics:
|
||||
client: true
|
||||
default: 5
|
||||
enable_mobile_theme:
|
||||
client: true
|
||||
default: true
|
||||
|
Loading…
Reference in New Issue
Block a user