From 116ddec22e35f5ae9cc32ac4c348a91e6cb6450d Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Fri, 20 Apr 2018 10:25:52 +0800
Subject: [PATCH] UX: Don't match emails in user selector in group add members
 modal.

https://meta.discourse.org/t/cant-add-members-to-a-group/85738?u=tgxworld
---
 .../javascripts/discourse/components/user-selector.js.es6   | 6 ++++--
 app/assets/javascripts/discourse/lib/user-search.js.es6     | 2 +-
 .../discourse/templates/modal/group-add-members.hbs         | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/user-selector.js.es6 b/app/assets/javascripts/discourse/components/user-selector.js.es6
index 3c9aefe6fb6..561197075d3 100644
--- a/app/assets/javascripts/discourse/components/user-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/user-selector.js.es6
@@ -33,7 +33,8 @@ export default TextField.extend({
         excludeCurrentUser = bool('excludeCurrentUser'),
         single = bool('single'),
         allowAny = bool('allowAny'),
-        disabled = bool('disabled');
+        disabled = bool('disabled'),
+        disallowEmails = bool('disallowEmails');
 
     function excludedUsernames() {
       // hack works around some issues with allowAny eventing
@@ -64,7 +65,8 @@ export default TextField.extend({
           allowedUsers,
           includeMentionableGroups,
           includeMessageableGroups,
-          group: self.get("group")
+          group: self.get("group"),
+          disallowEmails,
         });
 
         return results;
diff --git a/app/assets/javascripts/discourse/lib/user-search.js.es6 b/app/assets/javascripts/discourse/lib/user-search.js.es6
index ceed4404e76..a6349e2fa06 100644
--- a/app/assets/javascripts/discourse/lib/user-search.js.es6
+++ b/app/assets/javascripts/discourse/lib/user-search.js.es6
@@ -61,7 +61,7 @@ function organizeResults(r, options) {
     });
   }
 
-  if (options.term.match(/@/)) {
+  if (!options.disallowEmails && options.term.match(/@/)) {
     let e = { username: options.term };
     emails = [ e ];
     results.push(e);
diff --git a/app/assets/javascripts/discourse/templates/modal/group-add-members.hbs b/app/assets/javascripts/discourse/templates/modal/group-add-members.hbs
index 59db5812990..d32d729c075 100644
--- a/app/assets/javascripts/discourse/templates/modal/group-add-members.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/group-add-members.hbs
@@ -9,7 +9,8 @@
           class="input-xxlarge"
           usernames=model.usernames
           placeholderKey="groups.selector_placeholder"
-          id="group-add-members-user-selector"}}
+          id="group-add-members-user-selector"
+          disallowEmails=true}}
     </div>
 
     {{#if currentUser.admin}}