From 2c6f699a1fb5741d6a054b1d97198515690d7f88 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Thu, 11 Jun 2020 21:41:05 +0300
Subject: [PATCH] Add router link to user's profile to log entry message
---
src/views/moderation_log/LogEntryMessage.vue | 8 ++------
src/views/moderation_log/index.vue | 12 ++++++++----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/moderation_log/LogEntryMessage.vue b/src/views/moderation_log/LogEntryMessage.vue
index 101b1203..d9cc8547 100644
--- a/src/views/moderation_log/LogEntryMessage.vue
+++ b/src/views/moderation_log/LogEntryMessage.vue
@@ -4,7 +4,7 @@
v-if="propertyExists(actor, 'id')"
:to="{ name: 'UsersShow', params: { id: actor.id }}"
class="router-link">
- <span v-if="propertyExists(actor, 'nickname')">
+ <span v-if="propertyExists(actor, 'nickname')" style="font-weight: 600">
@{{ actor.nickname }}
</span>
</router-link>
@@ -24,15 +24,11 @@ export default {
message: {
type: String,
required: true
- },
- data: {
- type: Object,
- required: true
}
},
computed: {
logEntryMessage() {
- return this.message
+ return this.message.split(this.actor.nickname)[1]
}
},
methods: {
diff --git a/src/views/moderation_log/index.vue b/src/views/moderation_log/index.vue
index f8e822fe..af123e22 100644
--- a/src/views/moderation_log/index.vue
+++ b/src/views/moderation_log/index.vue
@@ -43,7 +43,8 @@
v-for="(logEntry, index) in log"
:key="index"
:timestamp="normalizeTimestamp(logEntry.time)">
- <log-entry-message :actor="logEntry.data.actor" :data="logEntry.data" :message="logEntry.message"/>
+ <log-entry-message v-if="propertyExists(logEntry.data.actor, 'nickname')" :actor="logEntry.data.actor" :message="logEntry.message"/>
+ <span v-else>{{ logEntry.message }}</span>
</el-timeline-item>
</el-timeline>
<div class="pagination">
@@ -115,9 +116,6 @@ export default {
this.$store.dispatch('FetchAdmins')
},
methods: {
- normalizeTimestamp(timestamp) {
- return moment(timestamp * 1000).format('YYYY-MM-DD HH:mm')
- },
fetchLogWithFilters() {
const filters = _.omitBy({
start_date: this.dateRange ? this.dateRange[0].toISOString() : null,
@@ -128,6 +126,12 @@ export default {
}, val => val === '' || val === null)
this.$store.dispatch('FetchModerationLog', filters)
+ },
+ normalizeTimestamp(timestamp) {
+ return moment(timestamp * 1000).format('YYYY-MM-DD HH:mm')
+ },
+ propertyExists(account, property) {
+ return account[property]
}
}
}
--
GitLab