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

FIX: Do not show User Cannot See Mention dialog when crafting a new topic or a new message

Browse Source 
Use the model/composer topic.id to determine what users cannot be mentioned and what message to show as a warning.
This commit is contained in:
cpradio 2017-03-16 15:22:53 -04:00 committed by Guo Xiang Tan
parent 3eb125c39b
commit aeb169bd0e
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/assets/javascripts/discourse/components/composer-editor.js.es6
View File

@ -3,6 +3,7 @@ import { default as computed, on } from 'ember-addons/ember-computed-decorators'
import { linkSeenMentions, fetchUnseenMentions } from 'discourse/lib/link-mentions'; import { linkSeenMentions, fetchUnseenMentions } from 'discourse/lib/link-mentions';
import { linkSeenCategoryHashtags, fetchUnseenCategoryHashtags } from 'discourse/lib/link-category-hashtags'; import { linkSeenCategoryHashtags, fetchUnseenCategoryHashtags } from 'discourse/lib/link-category-hashtags';
import { linkSeenTagHashtags, fetchUnseenTagHashtags } from 'discourse/lib/link-tag-hashtag'; import { linkSeenTagHashtags, fetchUnseenTagHashtags } from 'discourse/lib/link-tag-hashtag';
import Composer from 'discourse/models/composer';
import { load } from 'pretty-text/oneboxer'; import { load } from 'pretty-text/oneboxer';
import { ajax } from 'discourse/lib/ajax'; import { ajax } from 'discourse/lib/ajax';
import InputValidation from 'discourse/models/input-validation'; import InputValidation from 'discourse/models/input-validation';
@ -138,7 +139,7 @@ export default Ember.Component.extend({
_renderUnseenMentions($preview, unseen) { _renderUnseenMentions($preview, unseen) {
// 'Create a New Topic' scenario is not supported (per conversation with codinghorror) // 'Create a New Topic' scenario is not supported (per conversation with codinghorror)
// https://meta.discourse.org/t/taking-another-1-7-release-task/51986/7 // https://meta.discourse.org/t/taking-another-1-7-release-task/51986/7
fetchUnseenMentions(unseen, this.get('topic.id')).then(() => { fetchUnseenMentions(unseen, this.get('composer.topic.id')).then(() => {
linkSeenMentions($preview, this.siteSettings); linkSeenMentions($preview, this.siteSettings);
this._warnMentionedGroups($preview); this._warnMentionedGroups($preview);
this._warnCannotSeeMention($preview); this._warnCannotSeeMention($preview);
@ -187,13 +188,25 @@ export default Ember.Component.extend({
}, },
_warnCannotSeeMention($preview) { _warnCannotSeeMention($preview) {
const composerDraftKey = this.get('composer.draftKey');
if (composerDraftKey === Composer.CREATE_TOPIC ||
composerDraftKey === Composer.NEW_PRIVATE_MESSAGE_KEY ||
composerDraftKey === Composer.REPLY_AS_NEW_TOPIC_KEY ||
composerDraftKey === Composer.REPLY_AS_NEW_PRIVATE_MESSAGE_KEY) {
return;
}
Ember.run.scheduleOnce('afterRender', () => { Ember.run.scheduleOnce('afterRender', () => {
var found = this.get('warnedCannotSeeMentions') || []; let found = this.get('warnedCannotSeeMentions') || [];
$preview.find('.mention.cannot-see').each((idx,e) => { $preview.find('.mention.cannot-see').each((idx,e) => {
const $e = $(e); const $e = $(e);
var name = $e.data('name'); let name = $e.data('name');
if (found.indexOf(name) === -1) { if (found.indexOf(name) === -1) {
this.sendAction('cannotSeeMention', [{name: name}]); this.sendAction('cannotSeeMention', [{ name: name }]);
found.push(name); found.push(name);
} }
}); });

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

@ -367,7 +367,7 @@ export default Ember.Controller.extend({
cannotSeeMention(mentions) { cannotSeeMention(mentions) {
mentions.forEach(mention => { mentions.forEach(mention => {
const translation = (this.get('topic.isPrivateMessage')) ? const translation = (this.get('model.topic.isPrivateMessage')) ?
'composer.cannot_see_mention.private' : 'composer.cannot_see_mention.private' :
'composer.cannot_see_mention.category'; 'composer.cannot_see_mention.category';
const body = I18n.t(translation, { const body = I18n.t(translation, {

2
app/assets/javascripts/discourse/mixins/open-composer.js.es6
View File

@ -32,7 +32,7 @@ export default Ember.Mixin.create({
topicTitle, topicTitle,
topicBody, topicBody,
archetypeId: 'private_message', archetypeId: 'private_message',
draftKey: 'new_private_message' draftKey: Composer.NEW_PRIVATE_MESSAGE_KEY
}); });
} }

2
app/assets/javascripts/discourse/models/composer.js.es6
View File

@ -15,6 +15,7 @@ const CLOSED = 'closed',
// The actions the composer can take // The actions the composer can take
CREATE_TOPIC = 'createTopic', CREATE_TOPIC = 'createTopic',
PRIVATE_MESSAGE = 'privateMessage', PRIVATE_MESSAGE = 'privateMessage',
NEW_PRIVATE_MESSAGE_KEY = 'new_private_message',
REPLY = 'reply', REPLY = 'reply',
EDIT = 'edit', EDIT = 'edit',
REPLY_AS_NEW_TOPIC_KEY = "reply_as_new_topic", REPLY_AS_NEW_TOPIC_KEY = "reply_as_new_topic",
@ -815,6 +816,7 @@ Composer.reopenClass({
EDIT, EDIT,
// Draft key // Draft key
NEW_PRIVATE_MESSAGE_KEY,
REPLY_AS_NEW_TOPIC_KEY, REPLY_AS_NEW_TOPIC_KEY,
REPLY_AS_NEW_PRIVATE_MESSAGE_KEY REPLY_AS_NEW_PRIVATE_MESSAGE_KEY
}); });