diff options
Diffstat (limited to 'app/assets/javascripts/issues_list/components/issuable.vue')
| -rw-r--r-- | app/assets/javascripts/issues_list/components/issuable.vue | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/app/assets/javascripts/issues_list/components/issuable.vue b/app/assets/javascripts/issues_list/components/issuable.vue index b12b20d0135..16f8e67cde0 100644 --- a/app/assets/javascripts/issues_list/components/issuable.vue +++ b/app/assets/javascripts/issues_list/components/issuable.vue @@ -35,6 +35,7 @@ export default { i18n: { openedAgo: __('opened %{timeAgoString} by %{user}'), openedAgoJira: __('opened %{timeAgoString} by %{user} in Jira'), + openedAgoServiceDesk: __('opened %{timeAgoString} by %{email} via %{user}'), }, inject: ['scopedLabelsAvailable'], components: { @@ -206,6 +207,11 @@ export default { healthStatus() { return convertToCamelCase(this.issuable.health_status); }, + openedMessage() { + if (this.isJiraIssue) return this.$options.i18n.openedAgoJira; + if (this.issuable.service_desk_reply_to) return this.$options.i18n.openedAgoServiceDesk; + return this.$options.i18n.openedAgo; + }, }, mounted() { // TODO: Refactor user popover to use its own component instead of @@ -311,9 +317,7 @@ export default { <span data-testid="openedByMessage" class="gl-display-none d-sm-inline-block gl-mr-4"> · - <gl-sprintf - :message="isJiraIssue ? $options.i18n.openedAgoJira : $options.i18n.openedAgo" - > + <gl-sprintf :message="openedMessage"> <template #timeAgoString> <span>{{ issuableCreatedAt }}</span> </template> @@ -326,6 +330,9 @@ export default { >{{ issuableAuthor.name }}</gl-link > </template> + <template #email> + <span>{{ issuable.service_desk_reply_to }}</span> + </template> </gl-sprintf> </span> |