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

Merge pull request #3651 from tgxworld/fix_broken_private_message_search_context 

FIX: Broken private message search context.
This commit is contained in:
Régis Hanol 2015-08-14 18:12:36 +02:00
parent 0a2f615aab 87fd70cd4a
commit 183f6d89b8
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/assets/javascripts/discourse/controllers/search.js.es6
View File

@ -14,9 +14,9 @@ export default Em.Controller.extend({
return Ember.get(searchContext, 'type'); return Ember.get(searchContext, 'type');
} }
}, },
set(key, value) { set(value, searchContext) {
// a bit hacky, consider cleaning this up, need to work through all observers though // a bit hacky, consider cleaning this up, need to work through all observers though
const context = $.extend({}, this.get('searchContext')); const context = $.extend({}, searchContext);
context.type = value; context.type = value;
this.set('searchContext', context); this.set('searchContext', context);
return this.get('searchContext.type'); return this.get('searchContext.type');