From 40684ff7e680b6007fca43e7c6f1ddc474a5e9de Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 29 Oct 2014 13:58:05 -0400 Subject: [PATCH] FIX: queryParams and `Em.set` for later Ember versions (1.7+) --- .../discourse/controllers/topic.js.es6 | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index 018a8defb23..ebfbc01e734 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -39,11 +39,24 @@ export default ObjectController.extend(Discourse.SelectedPostsCount, { }.observes('controllers.search.term', 'controllers.header.visibleDropdown'), - filter: function(key, value) { + show_deleted: function(key, value) { + var postStream = this.get('postStream'); + if (!postStream) { return; } + if (arguments.length > 1) { - this.set('postStream.summary', value === "summary"); + postStream.set('show_deleted', value); } - return this.get('postStream.summary') ? "summary" : null; + return postStream.get('show_deleted') ? true : null; + }.property('postStream.summary'), + + filter: function(key, value) { + var postStream = this.get('postStream'); + if (!postStream) { return; } + + if (arguments.length > 1) { + postStream.set('summary', value === "summary"); + } + return postStream.get('summary') ? "summary" : null; }.property('postStream.summary'), username_filters: Discourse.computed.queryAlias('postStream.streamFilters.username_filters'),