IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

BUGFIX: avatar in history dialog

Browse Source
This commit is contained in:
Régis Hanol 2014-06-04 18:35:14 +02:00
parent cc3119f003
commit bc7730e0dd
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/helpers/application_helpers.js
View File

@ -228,13 +228,13 @@ Ember.Handlebars.registerBoundHelper('boundAvatar', function(user, size, uploadI
uploadId = Em.get(user, 'uploaded_avatar_id'); uploadId = Em.get(user, 'uploaded_avatar_id');
} }
var avatarTemplate = Discourse.User.avatarTemplate(username,uploadId); var avatarTemplate = Discourse.User.avatarTemplate(username, uploadId);
return new Handlebars.SafeString(Discourse.Utilities.avatarImg({ return new Handlebars.SafeString(Discourse.Utilities.avatarImg({
size: size, size: size,
avatarTemplate: avatarTemplate avatarTemplate: avatarTemplate
})); }));
}, 'uploaded_avatar_id'); }, 'username', 'uploaded_avatar_id');
/* /*
* Used when we only have a template * Used when we only have a template

12
app/assets/javascripts/discourse/models/user.js
View File

@ -327,8 +327,8 @@ Discourse.User = Discourse.Model.extend({
}); });
}, },
avatarTemplate: function(){ avatarTemplate: function() {
return Discourse.User.avatarTemplate(this.get('username'),this.get('uploaded_avatar_id')); return Discourse.User.avatarTemplate(this.get('username'), this.get('uploaded_avatar_id'));
}.property('uploaded_avatar_id', 'username'), }.property('uploaded_avatar_id', 'username'),
/* /*
@ -416,17 +416,15 @@ Discourse.User = Discourse.Model.extend({
Discourse.User.reopenClass(Discourse.Singleton, { Discourse.User.reopenClass(Discourse.Singleton, {
avatarTemplate: function(username, uploadedAvatarId){ avatarTemplate: function(username, uploadedAvatarId) {
var url; var url;
if(uploadedAvatarId){ if (uploadedAvatarId) {
url = "/user_avatar/" + url = "/user_avatar/" +
Discourse.BaseUrl + Discourse.BaseUrl +
"/" + "/" +
username.toLowerCase() + username.toLowerCase() +
"/{size}/" + "/{size}/" +
uploadedAvatarId + ".png"; uploadedAvatarId + ".png";
} else { } else {
url = "/letter_avatar/" + url = "/letter_avatar/" +
username.toLowerCase() + username.toLowerCase() +
@ -435,7 +433,7 @@ Discourse.User.reopenClass(Discourse.Singleton, {
} }
url = Discourse.getURL(url); url = Discourse.getURL(url);
if(Discourse.CDN){ if (Discourse.CDN) {
url = Discourse.CDN + url; url = Discourse.CDN + url;
} }
return url; return url;

4
app/assets/javascripts/discourse/templates/modal/history.js.handlebars
View File

@ -17,7 +17,7 @@
</div> </div>
</div> </div>
<div id="revision-details"> <div id="revision-details">
{{i18n post.revisions.details.edited_by}} {{boundAvatar content "small"}} {{username}} <span class="date">{{date created_at}}</span> {{#if edit_reason}} &mdash; <span class="edit-reason">{{edit_reason}}</span>{{/if}} {{i18n post.revisions.details.edited_by}} {{boundAvatarTemplate content.avatar_template "small"}} {{username}} <span class="date">{{date created_at}}</span> {{#if edit_reason}} &mdash; <span class="edit-reason">{{edit_reason}}</span>{{/if}}
</div> </div>
<div id="revisions"> <div id="revisions">
{{#if title_changes}} {{#if title_changes}}
@ -32,7 +32,7 @@
{{/if}} {{/if}}
{{#if user_changes}} {{#if user_changes}}
<div class="row"> <div class="row">
{{boundAvatar user_changes.previous "small"}} {{user_changes.previous.username}} → {{boundAvatar user_changes.current imageSize="small"}} {{user_changes.current.username}} {{boundAvatarTemplate user_changes.previous.avatar_template "small"}} {{user_changes.previous.username}} → {{boundAvatarTemplate user_changes.current.avatar_template "small"}} {{user_changes.current.username}}
</div> </div>
{{/if}} {{/if}}
{{#if wiki_changes}} {{#if wiki_changes}}