FIX: searchContext set too early
This was firing before previous route deactivated.
This commit is contained in:
parent
871f2113e4
commit
b143b64511
|
@ -11,7 +11,6 @@ export default function(filter, params) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.controllerFor('search').set('searchContext', model.get('searchContext'));
|
|
||||||
this._setupNavigation(model);
|
this._setupNavigation(model);
|
||||||
return Em.RSVP.all([this._createSubcategoryList(model),
|
return Em.RSVP.all([this._createSubcategoryList(model),
|
||||||
this._retrieveTopicList(model, transaction)]);
|
this._retrieveTopicList(model, transaction)]);
|
||||||
|
@ -84,6 +83,7 @@ export default function(filter, params) {
|
||||||
noSubcategories: params && !!params.no_subcategories
|
noSubcategories: params && !!params.no_subcategories
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this.controllerFor('search').set('searchContext', model.get('searchContext'));
|
||||||
this.set('topics', null);
|
this.set('topics', null);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue