From b04fae2e2c7ff9706fec6d81dc4a5e1111f12293 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 23 Feb 2015 20:26:30 +0530
Subject: [PATCH] UX: show real name on the about page

---
 .../discourse/controllers/about.js.es6        |  4 +---
 .../templates/components/user-small.hbs       |  3 +++
 app/serializers/about_serializer.rb           |  4 ++--
 app/serializers/user_name_serializer.rb       | 20 +++++++++++++++++++
 4 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 app/serializers/user_name_serializer.rb

diff --git a/app/assets/javascripts/discourse/controllers/about.js.es6 b/app/assets/javascripts/discourse/controllers/about.js.es6
index 070f143bc2..2eeadfc68e 100644
--- a/app/assets/javascripts/discourse/controllers/about.js.es6
+++ b/app/assets/javascripts/discourse/controllers/about.js.es6
@@ -1,9 +1,7 @@
 import ObjectController from 'discourse/controllers/object';
 
 export default ObjectController.extend({
-  faqOverriden: function() {
-    return !(this.siteSettings.faq_url.length === 0);
-  }.property(),
+  faqOverriden: Ember.computed.gt('siteSettings.faq_url.length', 0),
 
   contactInfo: function() {
     if (Discourse.SiteSettings.contact_email) {
diff --git a/app/assets/javascripts/discourse/templates/components/user-small.hbs b/app/assets/javascripts/discourse/templates/components/user-small.hbs
index 674f8f7590..2bf19059db 100644
--- a/app/assets/javascripts/discourse/templates/components/user-small.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-small.hbs
@@ -1,4 +1,7 @@
 {{#link-to 'user' user.username}}
   {{avatar user imageSize="tiny"}}
   {{user.username}}
+  {{#if user.name}}
+    ({{user.name}})
+  {{/if}}
 {{/link-to}}
diff --git a/app/serializers/about_serializer.rb b/app/serializers/about_serializer.rb
index 63d795499e..df8eebc177 100644
--- a/app/serializers/about_serializer.rb
+++ b/app/serializers/about_serializer.rb
@@ -1,6 +1,6 @@
 class AboutSerializer < ApplicationSerializer
-  has_many :moderators, serializer: BasicUserSerializer, embed: :objects
-  has_many :admins, serializer: BasicUserSerializer, embed: :objects
+  has_many :moderators, serializer: UserNameSerializer, embed: :objects
+  has_many :admins, serializer: UserNameSerializer, embed: :objects
 
   attributes :stats,
              :description,
diff --git a/app/serializers/user_name_serializer.rb b/app/serializers/user_name_serializer.rb
new file mode 100644
index 0000000000..b1fa1c2e12
--- /dev/null
+++ b/app/serializers/user_name_serializer.rb
@@ -0,0 +1,20 @@
+class UserNameSerializer < ApplicationSerializer
+  attributes :id, :username, :name, :uploaded_avatar_id, :avatar_template
+
+  def include_name?
+    SiteSetting.enable_names?
+  end
+
+  def avatar_template
+    if Hash === object
+      User.avatar_template(user[:username], user[:uploaded_avatar_id])
+    else
+      object.avatar_template
+    end
+  end
+
+  def user
+    object[:user] || object
+  end
+
+end