summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-01-26 17:54:09 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-01-26 17:54:09 +0900
commit2334b41375783a4f3df7c3bb10b75a56b8f9358d (patch)
tree47f38ee4eb5ba0529e258507921935db20001934 /src/client
parentUpdate CHANGELOG.md (diff)
parent管理画面からリモートユーザー情報を更新できるように (... (diff)
downloadmisskey-2334b41375783a4f3df7c3bb10b75a56b8f9358d.tar.gz
misskey-2334b41375783a4f3df7c3bb10b75a56b8f9358d.tar.bz2
misskey-2334b41375783a4f3df7c3bb10b75a56b8f9358d.zip
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/admin/views/users.vue16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/client/app/admin/views/users.vue b/src/client/app/admin/views/users.vue
index 6b829a2f8d..09d074eee2 100644
--- a/src/client/app/admin/views/users.vue
+++ b/src/client/app/admin/views/users.vue
@@ -20,6 +20,7 @@
<ui-button @click="suspendUser" :disabled="suspending"><fa :icon="faSnowflake"/> {{ $t('suspend') }}</ui-button>
<ui-button @click="unsuspendUser" :disabled="unsuspending">{{ $t('unsuspend') }}</ui-button>
</ui-horizon-group>
+ <ui-button v-if="user.host != null" @click="updateRemoteUser"><fa :icon="faSync"/> {{ $t('update-remote-user') }}</ui-button>
<ui-textarea v-if="user" :value="user | json5" readonly tall style="margin-top:16px;"></ui-textarea>
</div>
</div>
@@ -65,7 +66,7 @@
import Vue from 'vue';
import i18n from '../../i18n';
import parseAcct from "../../../../misc/acct/parse";
-import { faCertificate, faUsers, faTerminal, faSearch, faKey } from '@fortawesome/free-solid-svg-icons';
+import { faCertificate, faUsers, faTerminal, faSearch, faKey, faSync } from '@fortawesome/free-solid-svg-icons';
import { faSnowflake } from '@fortawesome/free-regular-svg-icons';
import XUser from './users.user.vue';
@@ -89,7 +90,7 @@ export default Vue.extend({
offset: 0,
users: [],
existMore: false,
- faTerminal, faCertificate, faUsers, faSnowflake, faSearch, faKey
+ faTerminal, faCertificate, faUsers, faSnowflake, faSearch, faKey, faSync
};
},
@@ -265,6 +266,17 @@ export default Vue.extend({
this.refreshUser();
},
+ async updateRemoteUser() {
+ this.$root.api('admin/update-remote-user', { userId: this.user._id }).then(res => {
+ this.$root.dialog({
+ type: 'success',
+ text: this.$t('remote-user-updated')
+ });
+ });
+
+ this.refreshUser();
+ },
+
async getConfirmed(text: string): Promise<Boolean> {
const confirm = await this.$root.dialog({
type: 'warning',