Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/mail.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRichard Steinmetz <richard@steinmetz.cloud>2022-05-27 15:06:02 +0300
committerRichard Steinmetz <richard@steinmetz.cloud>2022-05-27 15:10:42 +0300
commit46b0c9d97c66d8fc2a36d07fd23bcff54ecc5cd0 (patch)
tree1341890960a73bf798454066158753c9c3975901 /src
parent46ef7f4d2812dd35a6d9dc9d09f85b10e0eafd8b (diff)
Render default subtitle when a message has no subject
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
Diffstat (limited to 'src')
-rw-r--r--src/components/Envelope.vue11
-rw-r--r--src/components/OutboxMessageListItem.vue11
2 files changed, 20 insertions, 2 deletions
diff --git a/src/components/Envelope.vue b/src/components/Envelope.vue
index 05eb46dba..063fdd2d3 100644
--- a/src/components/Envelope.vue
+++ b/src/components/Envelope.vue
@@ -55,7 +55,7 @@
<span v-if="draft" class="draft">
<em>{{ t('mail', 'Draft: ') }}</em>
</span>
- {{ data.subject }}
+ {{ subjectForSubtitle }}
</template>
<template #actions>
<EnvelopePrimaryActions v-if="!moreActionsOpen">
@@ -379,6 +379,15 @@ export default {
}
return label
},
+ /**
+ * Subject of envelope or "No Subject".
+ * @returns {string}
+ */
+ subjectForSubtitle() {
+ // We have to use || here (instead of ??) because the subject might be '', null
+ // or undefined.
+ return this.data.subject || this.t('mail', 'No subject')
+ },
},
methods: {
setSelected(value) {
diff --git a/src/components/OutboxMessageListItem.vue b/src/components/OutboxMessageListItem.vue
index 69520eb7d..ea8f897ca 100644
--- a/src/components/OutboxMessageListItem.vue
+++ b/src/components/OutboxMessageListItem.vue
@@ -34,7 +34,7 @@
<Avatar :display-name="avatarDisplayName" :email="avatarEmail" />
</template>
<template #subtitle>
- {{ message.subject }}
+ {{ subjectForSubtitle }}
</template>
<template slot="actions">
<ActionButton
@@ -112,6 +112,15 @@ export default {
}
return moment.unix(this.message.sendAt).fromNow()
},
+ /**
+ * Subject of message or "No Subject".
+ * @returns {string}
+ */
+ subjectForSubtitle() {
+ // We have to use || here (instead of ??) because the subject might be '', null
+ // or undefined.
+ return this.message.subject || this.t('mail', 'No subject')
+ },
},
methods: {
async deleteMessage() {