diff --git a/app/assets/javascripts/discourse/views/avatar-selector.js.es6 b/app/assets/javascripts/discourse/views/avatar-selector.js.es6
index 15b8541ef36..6fcc5c9bc49 100644
--- a/app/assets/javascripts/discourse/views/avatar-selector.js.es6
+++ b/app/assets/javascripts/discourse/views/avatar-selector.js.es6
@@ -1,3 +1,4 @@
+import { on, observes } from "ember-addons/ember-computed-decorators";
import ModalBodyView from "discourse/views/modal-body";
export default ModalBodyView.extend({
@@ -6,11 +7,14 @@ export default ModalBodyView.extend({
title: I18n.t('user.change_avatar.title'),
// *HACK* used to select the proper radio button, because {{action}} stops the default behavior
- selectedChanged: function() {
+ @on("didInsertElement")
+ @observes("controller.selected")
+ selectedChanged() {
Em.run.next(() => $('input:radio[name="avatar"]').val([this.get('controller.selected')]));
- }.observes('controller.selected').on("didInsertElement"),
+ },
- _focusSelectedButton: function() {
+ @on("didInsertElement")
+ _focusSelectedButton() {
Em.run.next(() => $('input:radio[value="' + this.get('controller.selected') + '"]').focus());
- }.on("didInsertElement")
+ }
});
diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb
index ed8f31e4af0..26664810702 100644
--- a/app/controllers/user_avatars_controller.rb
+++ b/app/controllers/user_avatars_controller.rb
@@ -13,7 +13,10 @@ class UserAvatarsController < ApplicationController
user.create_user_avatar(user_id: user.id) unless user.user_avatar
user.user_avatar.update_gravatar!
- render json: { upload_id: user.user_avatar.gravatar_upload_id }
+ render json: {
+ gravatar_upload_id: user.user_avatar.gravatar_upload_id,
+ gravatar_avatar_template: User.avatar_template(user.username, user.user_avatar.gravatar_upload_id)
+ }
else
raise Discourse::NotFound
end
diff --git a/app/models/user.rb b/app/models/user.rb
index 4c8e1d9aad5..b00ac21b3a2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -471,9 +471,8 @@ class User < ActiveRecord::Base
def self.system_avatar_template(username)
# TODO it may be worth caching this in a distributed cache, should be benched
if SiteSetting.external_system_avatars_enabled
- color = letter_avatar_color(username)
url = SiteSetting.external_system_avatars_url.dup
- url.gsub! "{color}", color
+ url.gsub! "{color}", letter_avatar_color(username)
url.gsub! "{username}", username
url.gsub! "{first_letter}", username[0].downcase
url
@@ -482,10 +481,6 @@ class User < ActiveRecord::Base
end
end
- def letter_avatar_color
- self.class.letter_avatar_color(username)
- end
-
def self.letter_avatar_color(username)
username = username || ""
color = LetterAvatar::COLORS[Digest::MD5.hexdigest(username)[0...15].to_i(16) % LetterAvatar::COLORS.length]
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index 2d216a51502..334b20e2d24 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -93,8 +93,12 @@ class UserSerializer < BasicUserSerializer
:watched_category_ids,
:private_messages_stats,
:disable_jump_reply,
+ :system_avatar_upload_id,
+ :system_avatar_template,
:gravatar_avatar_upload_id,
+ :gravatar_avatar_template,
:custom_avatar_upload_id,
+ :custom_avatar_template,
:has_title_badges,
:card_image_badge,
:card_image_badge_id,
@@ -278,14 +282,32 @@ class UserSerializer < BasicUserSerializer
UserAction.private_messages_stats(object.id, scope)
end
+ def system_avatar_upload_id
+ # should be left blank
+ end
+
+ def system_avatar_template
+ User.system_avatar_template(object.username)
+ end
+
def gravatar_avatar_upload_id
object.user_avatar.try(:gravatar_upload_id)
end
+ def gravatar_avatar_template
+ return unless gravatar_upload_id = object.user_avatar.try(:gravatar_upload_id)
+ User.avatar_template(object.username, gravatar_upload_id)
+ end
+
def custom_avatar_upload_id
object.user_avatar.try(:custom_upload_id)
end
+ def custom_avatar_template
+ return unless custom_upload_id = object.user_avatar.try(:custom_upload_id)
+ User.avatar_template(object.username, custom_upload_id)
+ end
+
def has_title_badges
object.badges.where(allow_title: true).count > 0
end
diff --git a/test/javascripts/lib/avatar-template-test.js.es6 b/test/javascripts/lib/avatar-template-test.js.es6
deleted file mode 100644
index c2f004c8da2..00000000000
--- a/test/javascripts/lib/avatar-template-test.js.es6
+++ /dev/null
@@ -1,16 +0,0 @@
-import avatarTemplate from 'discourse/lib/avatar-template';
-
-module('lib:avatar-template');
-
-test("avatarTemplate", function(){
- var oldCDN = Discourse.CDN;
- var oldBase = Discourse.BaseUrl;
- Discourse.BaseUrl = "frogs.com";
-
- equal(avatarTemplate("sam", 1), "/user_avatar/frogs.com/sam/{size}/1.png");
- Discourse.CDN = "http://awesome.cdn.com";
- equal(avatarTemplate("sam", 1), "http://awesome.cdn.com/user_avatar/frogs.com/sam/{size}/1.png");
- Discourse.CDN = oldCDN;
- Discourse.BaseUrl = oldBase;
-});
-