github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 11:04:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: stop showing incorrect avatars in quote

Browse Source
This commit is contained in:
Sam 2015-08-05 19:22:51 +10:00
parent 4486879fd2
commit aef575aad0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/dialects/quote_dialect.js
View File

@ -26,7 +26,9 @@ Discourse.BBCode.register('quote', {noWrap: true, singlePara: true}, function(co
if (options.lookupAvatarByPostNumber) { if (options.lookupAvatarByPostNumber) {
// client-side, we can retrieve the avatar from the post // client-side, we can retrieve the avatar from the post
var postNumber = parseInt(params['data-post'], 10); var postNumber = parseInt(params['data-post'], 10);
avatarImg = options.lookupAvatarByPostNumber(postNumber); var topicId = parseInt(params['data-topic'], 10);
avatarImg = options.lookupAvatarByPostNumber(postNumber, topicId);
} else if (options.lookupAvatar) { } else if (options.lookupAvatar) {
// server-side, we need to lookup the avatar from the username // server-side, we need to lookup the avatar from the username
avatarImg = options.lookupAvatar(username); avatarImg = options.lookupAvatar(username);

4
app/assets/javascripts/discourse/views/composer.js.es6
View File

@ -260,9 +260,9 @@ const ComposerView = Discourse.View.extend(Ember.Evented, {
this.editor = editor = Discourse.Markdown.createEditor({ this.editor = editor = Discourse.Markdown.createEditor({
containerElement: this.element, containerElement: this.element,
lookupAvatarByPostNumber(postNumber) { lookupAvatarByPostNumber(postNumber, topicId) {
const posts = self.get('controller.controllers.topic.model.postStream.posts'); const posts = self.get('controller.controllers.topic.model.postStream.posts');
if (posts) { if (posts && topicId === self.get('controller.controllers.topic.model.id')) {
const quotedPost = posts.findProperty("post_number", postNumber); const quotedPost = posts.findProperty("post_number", postNumber);
if (quotedPost) { if (quotedPost) {
const username = quotedPost.get('username'), const username = quotedPost.get('username'),