Browse Source

Merge pull request #15042 from nextcloud/backport/15040/stable31

pull/15044/head
Maksim Sukharev 6 months ago
committed by GitHub
parent
commit
0e3676374e
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      src/components/ConversationSettings/BasicInfo.vue
  2. 6
      src/components/UIShared/ConversationActionsShortcut.vue

2
src/components/ConversationSettings/BasicInfo.vue

@ -6,7 +6,7 @@
<template>
<Fragment>
<!-- eslint-disable-next-line vue/no-v-html -->
<p v-if="isEventConversation" class="app-settings-section__hint" v-html="calendarHint" />
<p v-if="canFullModerate && isEventConversation" class="app-settings-section__hint" v-html="calendarHint" />
<h4 class="app-settings-section__subtitle">
{{ t('spreed', 'Name') }}
</h4>

6
src/components/UIShared/ConversationActionsShortcut.vue

@ -109,9 +109,9 @@ async function showConfirmationDialog() {
<div class="conversation-actions"
:class="{ 'conversation-actions--highlighted': props.isHighlighted }">
<p>{{ descriptionLabel }}</p>
<div class="conversation-actions__buttons">
<NcButton v-if="isModerator"
type="error"
<div v-if="isModerator"
class="conversation-actions__buttons">
<NcButton type="error"
@click="showConfirmationDialog">
<template #icon>
<IconDelete />

Loading…
Cancel
Save