summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/notes/components/issue_note_awards_list.vue
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/notes/components/issue_note_awards_list.vue')
-rw-r--r--app/assets/javascripts/notes/components/issue_note_awards_list.vue12
1 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes/components/issue_note_awards_list.vue b/app/assets/javascripts/notes/components/issue_note_awards_list.vue
index 1c4bd6f3560..2dd27d65096 100644
--- a/app/assets/javascripts/notes/components/issue_note_awards_list.vue
+++ b/app/assets/javascripts/notes/components/issue_note_awards_list.vue
@@ -52,7 +52,12 @@
// We need to do this otherwise we will render the same emoji over and over again.
groupedAwards() {
const awards = this.awards.reduce((acc, award) => {
- Object.assign(acc, {[award.name]: [award]});
+ if (acc.hasOwnProperty(award.name)) {
+ acc[award.name].push(award);
+ } else {
+ Object.assign(acc, {[award.name]: [award]});
+ }
+
return acc;
}, {});
@@ -67,6 +72,7 @@
orderedAwards.thumbsdown = thumbsdown;
delete awards.thumbsdown;
}
+
return Object.assign({}, orderedAwards, awards);
},
isAuthoredByMe() {
@@ -75,7 +81,7 @@
},
methods: {
...mapActions([
- 'toggleAward',
+ 'toggleAwardRequest',
]),
getAwardHTML(name) {
return Emoji.glEmojiTag(name);
@@ -147,7 +153,7 @@
awardName: awardName === "100" ? 100: awardName,
};
- this.toggleAward(data)
+ this.toggleAwardRequest(data)
.catch(() => Flash('Something went wrong on our end.'));
},
},