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

FIX: Broken assigned topics search (#251) 

regressed in #239
This commit is contained in:
Jarek Radosz 2021-11-18 01:58:01 +01:00 committed by GitHub
parent 89a61b58f8
commit f88c419a8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/javascripts/discourse-assign/controllers/group-assigned-show.js.es6
View File

@ -1,5 +1,5 @@
import UserTopicsList from "discourse/controllers/user-topics-list"; 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 discourseDebounce from "discourse-common/lib/debounce";
import { INPUT_DELAY } from "discourse-common/config/environment"; import { INPUT_DELAY } from "discourse-common/config/environment";
import { inject as controller } from "@ember/controller"; import { inject as controller } from "@ember/controller";
@ -18,8 +18,6 @@ export default UserTopicsList.extend({
queryParams: ["order", "ascending", "search"], queryParams: ["order", "ascending", "search"],
searchTerm: readOnly("search"),
_setSearchTerm(searchTerm) { _setSearchTerm(searchTerm) {
this.set("search", searchTerm); this.set("search", searchTerm);
this.refreshModel(); this.refreshModel();

3
assets/javascripts/discourse-assign/controllers/user-activity-assigned.js.es6
View File

@ -8,7 +8,6 @@ import { action } from "@ember/object";
import getURL from "discourse-common/lib/get-url"; import getURL from "discourse-common/lib/get-url";
import { iconHTML } from "discourse-common/lib/icon-library"; import { iconHTML } from "discourse-common/lib/icon-library";
import I18n from "I18n"; import I18n from "I18n";
import { readOnly } from "@ember/object/computed";
export default UserTopicsList.extend({ export default UserTopicsList.extend({
user: controller(), user: controller(),
@ -18,8 +17,6 @@ export default UserTopicsList.extend({
ascending: false, ascending: false,
search: "", search: "",
searchTerm: readOnly("search"),
_setSearchTerm(searchTerm) { _setSearchTerm(searchTerm) {
this.set("search", searchTerm); this.set("search", searchTerm);
this.refreshModel(); this.refreshModel();

2
assets/javascripts/discourse/templates/group-topics-list.hbs
View File

@ -2,7 +2,7 @@
<div class="inline-form full-width"> <div class="inline-form full-width">
{{input {{input
class="no-blur" class="no-blur"
value=searchTerm value=(readonly search)
placeholder=(i18n "discourse_assign.topic_search_placeholder") placeholder=(i18n "discourse_assign.topic_search_placeholder")
input=(action "onChangeFilter" value="target.value") input=(action "onChangeFilter" value="target.value")
autocomplete="discourse" autocomplete="discourse"

2
assets/javascripts/discourse/templates/group/assigned.hbs
View File

@ -5,7 +5,7 @@
{{input {{input
type="text" type="text"
placeholder=(i18n "discourse_assign.sidebar_name_filter_placeholder") placeholder=(i18n "discourse_assign.sidebar_name_filter_placeholder")
value=filterName value=(readonly filterName)
class="search" class="search"
input=(action "onChangeFilterName" value="target.value") input=(action "onChangeFilterName" value="target.value")
}} }}

3
assets/javascripts/discourse/templates/user-assigned-topics.hbs
View File

@ -10,7 +10,7 @@
<div class="inline-form full-width"> <div class="inline-form full-width">
{{input {{input
class="no-blur" class="no-blur"
value=searchTerm value=(readonly search)
placeholder=(i18n "discourse_assign.topic_search_placeholder") placeholder=(i18n "discourse_assign.topic_search_placeholder")
input=(action "onChangeFilter" value="target.value") input=(action "onChangeFilter" value="target.value")
autocomplete="discourse" autocomplete="discourse"
@ -39,4 +39,3 @@
{{conditional-loading-spinner condition=model.loadingMore}} {{conditional-loading-spinner condition=model.loadingMore}}
{{/load-more}} {{/load-more}}
{{/if}} {{/if}}