osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support multi-group user search

Browse Source
This commit is contained in:
romanrizzi
2019-05-10 12:35:36 -03:00
committed by Guo Xiang Tan
parent 8728850452
commit e7ee556e87
6 changed files with 75 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/discourse/components/user-selector.js.es6
+1 -1
View File
@@ -72,7 +72,7 @@ export default TextField.extend({
allowedUsers,
includeMentionableGroups,
includeMessageableGroups,
group: userSelectorComponent.group,
groupMembersOf: userSelectorComponent.groupMembersOf,
allowEmails
});
},
app/assets/javascripts/discourse/lib/user-search.js.es6
+4 -4
View File
@@ -16,7 +16,7 @@ function performSearch(
includeMentionableGroups,
includeMessageableGroups,
allowedUsers,
group,
groupMembersOf,
resultsFn
) {
var cached = cache[term];
@@ -40,7 +40,7 @@ function performSearch(
include_groups: includeGroups,
include_mentionable_groups: includeMentionableGroups,
include_messageable_groups: includeMessageableGroups,
group: group,
groups: groupMembersOf,
topic_allowed_users: allowedUsers
}
});
@@ -140,7 +140,7 @@ export default function userSearch(options) {
includeMessageableGroups = options.includeMessageableGroups,
allowedUsers = options.allowedUsers,
topicId = options.topicId,
group = options.group;
groupMembersOf = options.groupMembersOf;
if (oldSearch) {
oldSearch.abort();
@@ -172,7 +172,7 @@ export default function userSearch(options) {
includeMentionableGroups,
includeMessageableGroups,
allowedUsers,
group,
groupMembersOf,
function(r) {
clearTimeout(clearPromise);
resolve(organizeResults(r, options));