Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-02 01:09:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Some query params were showing up as undefined

Browse Source
This commit is contained in:
Robin Ward 2014-12-29 14:50:51 -05:00
parent fb33576671
commit 6df00df1ae
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/discourse/routes/build-topic-route.js.es6
View File

@ -48,14 +48,19 @@ export default function(filter, extras) {
var periods = this.controllerFor('discovery').get('periods'),
periodId = model.get('for_period') || (filter.indexOf('/') > 0 ? filter.split('/')[1] : '');
this.controllerFor('discovery/topics').setProperties({
var topicOpts = {
model: model,
category: null,
period: periods.findBy('id', periodId),
selected: [],
order: model.get('params.order'),
ascending: model.get('params.ascending'),
});
};
var params = model.get('params');
if (params && Object.keys(params).length) {
topicOpts.order = params.order;
topicOpts.ascending = params.ascending;
}
this.controllerFor('discovery/topics').setProperties(topicOpts);
this.openTopicDraft(model);
this.controllerFor('navigation/default').set('canCreateTopic', model.get('can_create_topic'));

6
app/assets/javascripts/discourse/routes/discourse_location.js
View File

@ -66,10 +66,8 @@ Ember.DiscourseLocation = Ember.Object.extend({
rootURL = rootURL.replace(/\/$/, '');
url = url.replace(rootURL, '');
if (Ember.FEATURES.isEnabled("query-params-new")) {
var search = location.search || '';
url += search;
}
var search = location.search || '';
url += search;
return url;
},