From fa02df99854c189cd33027f6560e0ac83aa6f355 Mon Sep 17 00:00:00 2001 From: OsamaSayegh Date: Thu, 19 Jul 2018 12:02:34 +0300 Subject: [PATCH] FIX: don't suggest groups when inviting to a topic (#6105) --- app/assets/javascripts/discourse/controllers/invite.js.es6 | 5 ----- app/assets/javascripts/discourse/templates/modal/invite.hbs | 1 - 2 files changed, 6 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/invite.js.es6 b/app/assets/javascripts/discourse/controllers/invite.js.es6 index f344e605460..1b750a18659 100644 --- a/app/assets/javascripts/discourse/controllers/invite.js.es6 +++ b/app/assets/javascripts/discourse/controllers/invite.js.es6 @@ -225,11 +225,6 @@ export default Ember.Controller.extend(ModalFunctionality, { return Group.findAll({ term: term, ignore_automatic: true }); }, - @computed("isPrivateTopic", "isMessage") - includeMentionableGroups(isPrivateTopic, isMessage) { - return !isPrivateTopic && !isMessage; - }, - @computed("isMessage", "emailOrUsername", "invitingExistingUserToTopic") successMessage(isMessage, emailOrUsername, invitingExistingUserToTopic) { if (this.get("hasGroups")) { diff --git a/app/assets/javascripts/discourse/templates/modal/invite.hbs b/app/assets/javascripts/discourse/templates/modal/invite.hbs index e401b8e712c..360560204c5 100644 --- a/app/assets/javascripts/discourse/templates/modal/invite.hbs +++ b/app/assets/javascripts/discourse/templates/modal/invite.hbs @@ -18,7 +18,6 @@ single=true allowAny=true excludeCurrentUser=true - includeMentionableGroups=includeMentionableGroups includeMessageableGroups=isMessage hasGroups=hasGroups usernames=emailOrUsername