FIX: Display the username instead of {{username}}

This commit is contained in:
Robin Ward
2019-04-08 16:46:05 -04:00
parent 32a0346069
commit bc949cf684
4 changed files with 21 additions and 5 deletions

View File

@@ -31,7 +31,7 @@
{{else}} {{else}}
{{#component reviewableComponent reviewable=reviewable tagName=''}} {{#component reviewableComponent reviewable=reviewable tagName=''}}
<div class='reviewable-scores-and-history'> <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=''}} {{reviewable-histories histories=reviewable.reviewable_histories tagName=''}}
</div> </div>
{{/component}} {{/component}}

View File

@@ -1,6 +1,8 @@
<tr class='reviewable-score'> <tr class='reviewable-score'>
<td> <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>
<td class='user'> <td class='user'>
{{#user-link user=rs.user}} {{#user-link user=rs.user}}

View File

@@ -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;
}
});

View File

@@ -1,8 +1,8 @@
{{#if scores}} {{#if reviewable.reviewable_scores}}
<table class='reviewable-scores'> <table class='reviewable-scores'>
<tbody> <tbody>
{{#each scores as |rs|}} {{#each reviewable.reviewable_scores as |rs|}}
{{reviewable-score rs=rs tagName=''}} {{reviewable-score rs=rs reviewable=reviewable}}
{{/each}} {{/each}}
</tbody> </tbody>
</table> </table>