From f88c419a8c1ce178359ff7e269e3def91dad5895 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Thu, 18 Nov 2021 01:58:01 +0100 Subject: [PATCH] FIX: Broken assigned topics search (#251) regressed in #239 --- .../discourse-assign/controllers/group-assigned-show.js.es6 | 4 +--- .../controllers/user-activity-assigned.js.es6 | 3 --- assets/javascripts/discourse/templates/group-topics-list.hbs | 2 +- assets/javascripts/discourse/templates/group/assigned.hbs | 2 +- .../javascripts/discourse/templates/user-assigned-topics.hbs | 3 +-- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/assets/javascripts/discourse-assign/controllers/group-assigned-show.js.es6 b/assets/javascripts/discourse-assign/controllers/group-assigned-show.js.es6 index 53bb7fc..7966ce8 100644 --- a/assets/javascripts/discourse-assign/controllers/group-assigned-show.js.es6 +++ b/assets/javascripts/discourse-assign/controllers/group-assigned-show.js.es6 @@ -1,5 +1,5 @@ import UserTopicsList from "discourse/controllers/user-topics-list"; -import { alias, readOnly } from "@ember/object/computed"; +import { alias } from "@ember/object/computed"; import discourseDebounce from "discourse-common/lib/debounce"; import { INPUT_DELAY } from "discourse-common/config/environment"; import { inject as controller } from "@ember/controller"; @@ -18,8 +18,6 @@ export default UserTopicsList.extend({ queryParams: ["order", "ascending", "search"], - searchTerm: readOnly("search"), - _setSearchTerm(searchTerm) { this.set("search", searchTerm); this.refreshModel(); diff --git a/assets/javascripts/discourse-assign/controllers/user-activity-assigned.js.es6 b/assets/javascripts/discourse-assign/controllers/user-activity-assigned.js.es6 index 16b6430..c55a24d 100644 --- a/assets/javascripts/discourse-assign/controllers/user-activity-assigned.js.es6 +++ b/assets/javascripts/discourse-assign/controllers/user-activity-assigned.js.es6 @@ -8,7 +8,6 @@ import { action } from "@ember/object"; import getURL from "discourse-common/lib/get-url"; import { iconHTML } from "discourse-common/lib/icon-library"; import I18n from "I18n"; -import { readOnly } from "@ember/object/computed"; export default UserTopicsList.extend({ user: controller(), @@ -18,8 +17,6 @@ export default UserTopicsList.extend({ ascending: false, search: "", - searchTerm: readOnly("search"), - _setSearchTerm(searchTerm) { this.set("search", searchTerm); this.refreshModel(); diff --git a/assets/javascripts/discourse/templates/group-topics-list.hbs b/assets/javascripts/discourse/templates/group-topics-list.hbs index 90dc6da..017e48c 100644 --- a/assets/javascripts/discourse/templates/group-topics-list.hbs +++ b/assets/javascripts/discourse/templates/group-topics-list.hbs @@ -2,7 +2,7 @@
{{input class="no-blur" - value=searchTerm + value=(readonly search) placeholder=(i18n "discourse_assign.topic_search_placeholder") input=(action "onChangeFilter" value="target.value") autocomplete="discourse" diff --git a/assets/javascripts/discourse/templates/group/assigned.hbs b/assets/javascripts/discourse/templates/group/assigned.hbs index a22119f..af1a8fb 100644 --- a/assets/javascripts/discourse/templates/group/assigned.hbs +++ b/assets/javascripts/discourse/templates/group/assigned.hbs @@ -5,7 +5,7 @@ {{input type="text" placeholder=(i18n "discourse_assign.sidebar_name_filter_placeholder") - value=filterName + value=(readonly filterName) class="search" input=(action "onChangeFilterName" value="target.value") }} diff --git a/assets/javascripts/discourse/templates/user-assigned-topics.hbs b/assets/javascripts/discourse/templates/user-assigned-topics.hbs index 7d78e69..6a172df 100644 --- a/assets/javascripts/discourse/templates/user-assigned-topics.hbs +++ b/assets/javascripts/discourse/templates/user-assigned-topics.hbs @@ -10,7 +10,7 @@
{{input class="no-blur" - value=searchTerm + value=(readonly search) placeholder=(i18n "discourse_assign.topic_search_placeholder") input=(action "onChangeFilter" value="target.value") autocomplete="discourse" @@ -39,4 +39,3 @@ {{conditional-loading-spinner condition=model.loadingMore}} {{/load-more}} {{/if}} -