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

Merge pull request #4556 from cpradio/cannot-see-mention-comments 

Add comments to relevant sections denoting "create new topic" …
This commit is contained in:
Jeff Atwood 2016-11-16 22:02:31 +01:00 committed by GitHub
parent 17f2be9f88 c3d4c949f1
commit a5de6f79a3
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,6 +137,8 @@ export default Ember.Component.extend({
}, },
_renderUnseenMentions($preview, unseen) { _renderUnseenMentions($preview, unseen) {
// '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
fetchUnseenMentions(unseen, this.get('topic.id')).then(() => { fetchUnseenMentions(unseen, this.get('topic.id')).then(() => {
linkSeenMentions($preview, this.siteSettings); linkSeenMentions($preview, this.siteSettings);
this._warnMentionedGroups($preview); this._warnMentionedGroups($preview);

2
app/assets/javascripts/discourse/lib/link-mentions.js.es6
View File

@ -51,6 +51,8 @@ export function linkSeenMentions($elem, siteSettings) {
return []; return [];
} }
// '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
export function fetchUnseenMentions(usernames, topic_id) { export function fetchUnseenMentions(usernames, topic_id) {
return ajax("/users/is_local_username", { data: { usernames, topic_id } }).then(r => { return ajax("/users/is_local_username", { data: { usernames, topic_id } }).then(r => {
r.valid.forEach(v => found[v] = true); r.valid.forEach(v => found[v] = true);

2
app/controllers/users_controller.rb
View File

@ -242,6 +242,8 @@ class UsersController < ApplicationController
usernames -= groups usernames -= groups
usernames.each(&:downcase!) usernames.each(&:downcase!)
# 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
cannot_see = [] cannot_see = []
topic_id = params[:topic_id] topic_id = params[:topic_id]
unless topic_id.blank? unless topic_id.blank?