summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2020-02-18 17:54:13 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2020-02-18 17:54:13 +0900
commit8a7197726e7e9f950d1be1a1f7b1b0b8779333fa (patch)
tree85c4b6cbc5c43da03979da2f12650d065c6d80a3 /src/client
parentFix bug (diff)
parent管理者はモデレーターに変更できないように (#5970) (diff)
downloadsharkey-8a7197726e7e9f950d1be1a1f7b1b0b8779333fa.tar.gz
sharkey-8a7197726e7e9f950d1be1a1f7b1b0b8779333fa.tar.bz2
sharkey-8a7197726e7e9f950d1be1a1f7b1b0b8779333fa.zip
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/client')
-rw-r--r--src/client/components/user-moderate-dialog.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/components/user-moderate-dialog.vue b/src/client/components/user-moderate-dialog.vue
index f45342564c..61b8dd0ba1 100644
--- a/src/client/components/user-moderate-dialog.vue
+++ b/src/client/components/user-moderate-dialog.vue
@@ -3,7 +3,7 @@
<template #header><mk-user-name :user="user"/></template>
<div class="vrcsvlkm">
<mk-button @click="resetPassword()" primary>{{ $t('resetPassword') }}</mk-button>
- <mk-switch v-if="$store.state.i.isAdmin" @change="toggleModerator()" v-model="moderator">{{ $t('moderator') }}</mk-switch>
+ <mk-switch v-if="$store.state.i.isAdmin && !user.isAdmin" @change="toggleModerator()" v-model="moderator">{{ $t('moderator') }}</mk-switch>
<mk-switch @change="toggleSilence()" v-model="silenced">{{ $t('silence') }}</mk-switch>
<mk-switch @change="toggleSuspend()" v-model="suspended">{{ $t('suspend') }}</mk-switch>
</div>
@@ -47,7 +47,7 @@ export default Vue.extend({
type: 'waiting',
iconOnly: true
});
-
+
this.$root.api('admin/reset-password', {
userId: this.user.id,
}).then(({ password }) => {