paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream edit: Extract stream_data.potential_subscribers().

Browse Source 
We want to move more logic to stream_data to facilitate
testing.

Both before and after this commit, we essentially build a
new list of users for typeahead, but now the new list
excludes subscribed users.  We can do even better than
this in a follow-up commit.
This commit is contained in:
Steve Howell
2020-03-21 14:22:40 +00:00
committed by Tim Abbott
parent 7088d09094
commit 156ff33d22
4 changed files with 70 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
static/js/stream_edit.js
View File

@@ -216,7 +216,7 @@ function show_subscription_settings(sub_row) {
}).init();
sub_settings.find('input[name="principal"]').typeahead({
source: people.get_realm_persons, // This is a function.
source: () => stream_data.potential_subscribers(sub),
items: 5,
highlighter: function (item) {
return typeahead_helper.render_person(item);
@@ -227,10 +227,8 @@ function show_subscription_settings(sub_row) {
return false;
}
// Case-insensitive.
const item_matches = item.email.toLowerCase().includes(query) ||
item.full_name.toLowerCase().includes(query);
const is_subscribed = stream_data.is_user_subscribed(sub.name, item.user_id);
return item_matches && !is_subscribed;
return item.email.toLowerCase().includes(query) ||
item.full_name.toLowerCase().includes(query);
},
sorter: function (matches) {
const current_stream = compose_state.stream_name();