scottk/chatwoot
1
0
Fork 0
mirror of https://github.com/lingble/chatwoot.git synced 2025-11-02 12:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Add fallback for created_by and updated_by attributes in Macro (#9436)

Browse Source
This commit is contained in:
Shivam Mishra
2024-05-09 02:10:07 +05:30
committed by GitHub
parent 6c5b137dba
commit 73f373913f
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/javascript/dashboard/routes/dashboard/settings/macros/MacrosTableRow.vue
View File

@@ -2,15 +2,15 @@
<tr> <tr>
<td>{{ macro.name }}</td> <td>{{ macro.name }}</td>
<td> <td>
<div class="avatar-container"> <div v-if="macro.created_by" class="avatar-container">
<thumbnail :username="macro.created_by.name" size="24px" /> <thumbnail :username="createdByName" size="24px" />
<span>{{ macro.created_by.name }}</span> <span>{{ createdByName }}</span>
</div> </div>
</td> </td>
<td> <td>
<div class="avatar-container"> <div v-if="macro.updated_by" class="avatar-container">
<thumbnail :username="macro.updated_by.name" size="24px" /> <thumbnail :username="updatedByName" size="24px" />
<span>{{ macro.updated_by.name }}</span> <span>{{ updatedByName }}</span>
</div> </div>
</td> </td>
<td>{{ visibilityLabel }}</td> <td>{{ visibilityLabel }}</td>
@@ -53,6 +53,14 @@ export default {
}, },
}, },
computed: { computed: {
createdByName() {
const createdBy = this.macro.created_by;
return createdBy.available_name ?? createdBy.email ?? '';
},
updatedByName() {
const updatedBy = this.macro.updated_by;
return updatedBy.available_name ?? updatedBy.email ?? '';
},
visibilityLabel() { visibilityLabel() {
return this.macro.visibility === 'global' return this.macro.visibility === 'global'
? this.$t('MACROS.EDITOR.VISIBILITY.GLOBAL.LABEL') ? this.$t('MACROS.EDITOR.VISIBILITY.GLOBAL.LABEL')