From 0985f7f609dd8ce0f30c1f96bb7cb0c2699e851e Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 15 Nov 2018 04:24:40 +0900
Subject: [PATCH] [Client] Fix bugs
---
src/client/app/admin/views/moderators.vue | 2 +-
src/client/app/admin/views/users.vue | 57 ++++++++++++++++-------
2 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/src/client/app/admin/views/moderators.vue b/src/client/app/admin/views/moderators.vue
index ebf20c12fd..ba9417d969 100644
--- a/src/client/app/admin/views/moderators.vue
+++ b/src/client/app/admin/views/moderators.vue
@@ -43,7 +43,7 @@ export default Vue.extend({
await process().catch(e => {
this.$root.alert({
type: 'error',
- text: e
+ text: e.toString()
});
});
diff --git a/src/client/app/admin/views/users.vue b/src/client/app/admin/views/users.vue
index e2a6d123c4..693d5cea84 100644
--- a/src/client/app/admin/views/users.vue
+++ b/src/client/app/admin/views/users.vue
@@ -49,6 +49,7 @@ import parseAcct from "../../../../misc/acct/parse";
export default Vue.extend({
i18n: i18n('admin/views/users.vue'),
+
data() {
return {
verifyUsername: null,
@@ -67,13 +68,19 @@ export default Vue.extend({
this.verifying = true;
const process = async () => {
- const user = await this.$root.os.api('users/show', parseAcct(this.verifyUsername));
- await this.$root.os.api('admin/verify-user', { userId: user.id });
- //this.$root.os.apis.dialog({ text: this.$t('verified') });
+ const user = await this.$root.api('users/show', parseAcct(this.verifyUsername));
+ await this.$root.api('admin/verify-user', { userId: user.id });
+ this.$root.alert({
+ type: 'success',
+ text: this.$t('verified')
+ });
};
await process().catch(e => {
- //this.$root.os.apis.dialog({ text: `Failed: ${e}` });
+ this.$root.alert({
+ type: 'error',
+ text: e.toString()
+ });
});
this.verifying = false;
@@ -83,13 +90,19 @@ export default Vue.extend({
this.unverifying = true;
const process = async () => {
- const user = await this.$root.os.api('users/show', parseAcct(this.unverifyUsername));
- await this.$root.os.api('admin/unverify-user', { userId: user.id });
- //this.$root.os.apis.dialog({ text: this.$t('unverified') });
+ const user = await this.$root.api('users/show', parseAcct(this.unverifyUsername));
+ await this.$root.api('admin/unverify-user', { userId: user.id });
+ this.$root.alert({
+ type: 'success',
+ text: this.$t('unverified')
+ });
};
await process().catch(e => {
- //this.$root.os.apis.dialog({ text: `Failed: ${e}` });
+ this.$root.alert({
+ type: 'error',
+ text: e.toString()
+ });
});
this.unverifying = false;
@@ -99,13 +112,19 @@ export default Vue.extend({
this.suspending = true;
const process = async () => {
- const user = await this.$root.os.api('users/show', parseAcct(this.suspendUsername));
- await this.$root.os.api('admin/suspend-user', { userId: user.id });
- //this.$root.os.apis.dialog({ text: this.$t('suspended') });
+ const user = await this.$root.api('users/show', parseAcct(this.suspendUsername));
+ await this.$root.api('admin/suspend-user', { userId: user.id });
+ this.$root.alert({
+ type: 'success',
+ text: this.$t('suspended')
+ });
};
await process().catch(e => {
- //this.$root.os.apis.dialog({ text: `Failed: ${e}` });
+ this.$root.alert({
+ type: 'error',
+ text: e.toString()
+ });
});
this.suspending = false;
@@ -115,13 +134,19 @@ export default Vue.extend({
this.unsuspending = true;
const process = async () => {
- const user = await this.$root.os.api('users/show', parseAcct(this.unsuspendUsername));
- await this.$root.os.api('admin/unsuspend-user', { userId: user.id });
- //this.$root.os.apis.dialog({ text: this.$t('unsuspended') });
+ const user = await this.$root.api('users/show', parseAcct(this.unsuspendUsername));
+ await this.$root.api('admin/unsuspend-user', { userId: user.id });
+ this.$root.alert({
+ type: 'success',
+ text: this.$t('unsuspended')
+ });
};
await process().catch(e => {
- //this.$root.os.apis.dialog({ text: `Failed: ${e}` });
+ this.$root.alert({
+ type: 'error',
+ text: e.toString()
+ });
});
this.unsuspending = false;