Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Broken group warning

This commit is contained in:
Robin Ward 2016-06-07 14:58:57 -04:00
parent 431179dd25
commit dbdcd0ca0f
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/discourse/components/composer-messages.js.es6
View File

@ -91,19 +91,6 @@ export default Ember.Component.extend({
this.send('popup', Ember.Object.create(info)); this.send('popup', Ember.Object.create(info));
}, },
groupsMentioned(groups) {
// reset existing messages, this should always win it is critical
this.reset();
groups.forEach(group => {
const body = I18n.t('composer.group_mentioned', {
group: "@" + group.name,
count: group.user_count,
group_link: Discourse.getURL(`/group/${group.name}/members`)
});
this.send("popup", Ember.Object.create({ templateName: 'custom-body', body }));
});
},
_findSimilar() { _findSimilar() {
const composer = this.get('composer'); const composer = this.get('composer');

13
app/assets/javascripts/discourse/controllers/composer.js.es6
View File

@ -230,7 +230,18 @@ export default Ember.Controller.extend({
groupsMentioned(groups) { groupsMentioned(groups) {
if (!this.get('model.creatingPrivateMessage') && !this.get('model.topic.isPrivateMessage')) { if (!this.get('model.creatingPrivateMessage') && !this.get('model.topic.isPrivateMessage')) {
this.get('controllers.composer-messages').groupsMentioned(groups); groups.forEach(group => {
const body = I18n.t('composer.group_mentioned', {
group: "@" + group.name,
count: group.user_count,
group_link: Discourse.getURL(`/group/${group.name}/members`)
});
this.appEvents.trigger('composer-messages:create', {
extraClass: 'custom-body',
templateName: 'custom-body',
body
});
});
} }
} }