From bc949cf684d6c215f7c1fb10834247ec2ce6d809 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 8 Apr 2019 16:46:05 -0400
Subject: [PATCH] FIX: Display the username instead of {{username}}

---
 .../templates/components/reviewable-item.hbs       |  2 +-
 .../templates/components/reviewable-score.hbs      |  4 +++-
 .../templates/components/reviewable-score.js.es6   | 14 ++++++++++++++
 .../templates/components/reviewable-scores.hbs     |  6 +++---
 4 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/templates/components/reviewable-score.js.es6

diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
index 7204a594b41..80495bcb63e 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
@@ -31,7 +31,7 @@
     {{else}}
       {{#component reviewableComponent reviewable=reviewable tagName=''}}
         <div class='reviewable-scores-and-history'>
-          {{reviewable-scores scores=reviewable.reviewable_scores tagName=''}}
+          {{reviewable-scores reviewable=reviewable tagName=''}}
           {{reviewable-histories histories=reviewable.reviewable_histories tagName=''}}
         </div>
       {{/component}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
index 1647ac718a8..7d8a72e8165 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
@@ -1,6 +1,8 @@
 <tr class='reviewable-score'>
   <td>
-    {{d-icon rs.score_type.icon}} {{rs.score_type.title}} <span class="badge-notification new-posts score">{{format-score rs.score}}</span>
+    {{d-icon rs.score_type.icon}}
+    {{title}}
+    <span class="badge-notification new-posts score">{{format-score rs.score}}</span>
   </td>
   <td class='user'>
     {{#user-link user=rs.user}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.js.es6 b/app/assets/javascripts/discourse/templates/components/reviewable-score.js.es6
new file mode 100644
index 00000000000..1a96cb9e836
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-score.js.es6
@@ -0,0 +1,14 @@
+import computed from "ember-addons/ember-computed-decorators";
+
+export default Ember.Component.extend({
+  tagName: "",
+
+  @computed("rs.score_type.title", "reviewable.target_created_by")
+  title(title, targetCreatedBy) {
+    if (targetCreatedBy) {
+      return title.replace("{{username}}", targetCreatedBy.username);
+    }
+
+    return title;
+  }
+});
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs
index 517993af0f2..e811554285a 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs
@@ -1,8 +1,8 @@
-{{#if scores}}
+{{#if reviewable.reviewable_scores}}
   <table class='reviewable-scores'>
     <tbody>
-    {{#each scores as |rs|}}
-      {{reviewable-score rs=rs tagName=''}}
+    {{#each reviewable.reviewable_scores as |rs|}}
+      {{reviewable-score rs=rs reviewable=reviewable}}
     {{/each}}
   </tbody>
   </table>