github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 03:06:53 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: don't suggest groups when inviting to a topic (#6105)

Browse Source
This commit is contained in:
OsamaSayegh
2018-07-19 12:02:34 +03:00
committed by Guo Xiang Tan
parent 4765507585
commit fa02df9985
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/controllers/invite.js.es6
View File

@ -225,11 +225,6 @@ export default Ember.Controller.extend(ModalFunctionality, {
return Group.findAll({ term: term, ignore_automatic: true }); return Group.findAll({ term: term, ignore_automatic: true });
}, },
@computed("isPrivateTopic", "isMessage")
includeMentionableGroups(isPrivateTopic, isMessage) {
return !isPrivateTopic && !isMessage;
},
@computed("isMessage", "emailOrUsername", "invitingExistingUserToTopic") @computed("isMessage", "emailOrUsername", "invitingExistingUserToTopic")
successMessage(isMessage, emailOrUsername, invitingExistingUserToTopic) { successMessage(isMessage, emailOrUsername, invitingExistingUserToTopic) {
if (this.get("hasGroups")) { if (this.get("hasGroups")) {

1
app/assets/javascripts/discourse/templates/modal/invite.hbs
View File

@ -18,7 +18,6 @@
single=true single=true
allowAny=true allowAny=true
excludeCurrentUser=true excludeCurrentUser=true
includeMentionableGroups=includeMentionableGroups
includeMessageableGroups=isMessage includeMessageableGroups=isMessage
hasGroups=hasGroups hasGroups=hasGroups
usernames=emailOrUsername usernames=emailOrUsername