mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-09 03:33:09 +02:00
parent
80619260c1
commit
1c0ec222b4
2 changed files with 7 additions and 1 deletions
|
@ -18,6 +18,7 @@
|
||||||
-
|
-
|
||||||
|
|
||||||
### Client
|
### Client
|
||||||
|
- プロフィール画面におけるモデレーションノートの表示を調整
|
||||||
- Fix: ユーザー選択ダイアログが表示されない問題を修正
|
- Fix: ユーザー選択ダイアログが表示されない問題を修正
|
||||||
|
|
||||||
### Server
|
### Server
|
||||||
|
|
|
@ -49,9 +49,12 @@
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="iAmModerator" class="moderationNote">
|
<div v-if="iAmModerator" class="moderationNote">
|
||||||
<MkTextarea v-model="moderationNote" manual-save>
|
<MkTextarea v-if="editModerationNote || (moderationNote != null && moderationNote !== '')" v-model="moderationNote" manual-save>
|
||||||
<template #label>Moderation note</template>
|
<template #label>Moderation note</template>
|
||||||
</MkTextarea>
|
</MkTextarea>
|
||||||
|
<div v-else>
|
||||||
|
<MkButton small @click="editModerationNote = true">Add moderation note</MkButton>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="isEditingMemo || memoDraft" class="memo" :class="{'no-memo': !memoDraft}">
|
<div v-if="isEditingMemo || memoDraft" class="memo" :class="{'no-memo': !memoDraft}">
|
||||||
<div class="heading" v-text="i18n.ts.memo"/>
|
<div class="heading" v-text="i18n.ts.memo"/>
|
||||||
|
@ -142,6 +145,7 @@ import MkRemoteCaution from '@/components/MkRemoteCaution.vue';
|
||||||
import MkTextarea from '@/components/MkTextarea.vue';
|
import MkTextarea from '@/components/MkTextarea.vue';
|
||||||
import MkOmit from '@/components/MkOmit.vue';
|
import MkOmit from '@/components/MkOmit.vue';
|
||||||
import MkInfo from '@/components/MkInfo.vue';
|
import MkInfo from '@/components/MkInfo.vue';
|
||||||
|
import MkButton from '@/components/MkButton.vue';
|
||||||
import { getScrollPosition } from '@/scripts/scroll';
|
import { getScrollPosition } from '@/scripts/scroll';
|
||||||
import { getUserMenu } from '@/scripts/get-user-menu';
|
import { getUserMenu } from '@/scripts/get-user-menu';
|
||||||
import number from '@/filters/number';
|
import number from '@/filters/number';
|
||||||
|
@ -176,6 +180,7 @@ let memoTextareaEl = $ref<null | HTMLElement>(null);
|
||||||
let memoDraft = $ref(props.user.memo);
|
let memoDraft = $ref(props.user.memo);
|
||||||
let isEditingMemo = $ref(false);
|
let isEditingMemo = $ref(false);
|
||||||
let moderationNote = $ref(props.user.moderationNote);
|
let moderationNote = $ref(props.user.moderationNote);
|
||||||
|
let editModerationNote = $ref(false);
|
||||||
|
|
||||||
watch($$(moderationNote), async () => {
|
watch($$(moderationNote), async () => {
|
||||||
await os.api('admin/update-user-note', { userId: props.user.id, text: moderationNote });
|
await os.api('admin/update-user-note', { userId: props.user.id, text: moderationNote });
|
||||||
|
|
Loading…
Reference in a new issue