diff --git a/src/api/__mocks__/login.js b/src/api/__mocks__/login.js index a980f88b25530ef8b58503c11ebd7122134a2047..31591f7be6f14f9a7da33ee368d76d98f55b4ee4 100644 --- a/src/api/__mocks__/login.js +++ b/src/api/__mocks__/login.js @@ -43,7 +43,7 @@ export function getUserInfo(token, authHost) { 'statuses_count': 0, 'cover_photo': '', 'hide_follows': false, - 'pleroma': { 'confirmation_pending': false, 'deactivated': false, 'tags': ['force_nsfw'], 'is_admin': true }, + 'pleroma': { 'is_confirmed': true, 'deactivated': false, 'tags': ['force_nsfw'], 'is_admin': true }, 'profile_image_url_original': '', 'created_at': 'Fri Mar 01 15:15:19 +0000 2019', 'fields': [], diff --git a/src/store/modules/users.js b/src/store/modules/users.js index 29b98fcf4d5fa040a90246b7e0631d817e1af9e0..a9477323710315adf6f02cd30b33ca3f2ae88dce 100644 --- a/src/store/modules/users.js +++ b/src/store/modules/users.js @@ -149,7 +149,7 @@ const users = { }, async ConfirmUsersEmail({ dispatch, getters }, { users, _userId, _statusId }) { const updatedUsers = users.map(user => { - return { ...user, confirmation_pending: false } + return { ...user, is_confirmed: true } }) const nicknames = users.map(user => user.nickname) const callApiFn = async() => await confirmUserEmail(nicknames, getters.authHost, getters.token) diff --git a/src/views/users/components/ModerationDropdown.vue b/src/views/users/components/ModerationDropdown.vue index d54efe4344d06a524fdd58d818fae3de4dc517dc..64aa75f6eb1310a5b250c22899f48145a07925cf 100644 --- a/src/views/users/components/ModerationDropdown.vue +++ b/src/views/users/components/ModerationDropdown.vue @@ -57,13 +57,13 @@ {{ $t('users.rejectAccount') }} </el-dropdown-item> <el-dropdown-item - v-if="user.local && user.confirmation_pending" + v-if="user.local && !user.is_confirmed" divided @click.native="handleEmailConfirmation(user)"> {{ $t('users.confirmAccount') }} </el-dropdown-item> <el-dropdown-item - v-if="user.local && user.confirmation_pending" + v-if="user.local && !user.is_confirmed" @click.native="handleConfirmationResend(user)"> {{ $t('users.resendConfirmation') }} </el-dropdown-item> diff --git a/src/views/users/components/MultipleUsersMenu.vue b/src/views/users/components/MultipleUsersMenu.vue index bdf65006c94d24aa69ebcf0820a0e6e27e8697be..8446bbb0fd4ea4dbe98713af832de092f77a1f84 100644 --- a/src/views/users/components/MultipleUsersMenu.vue +++ b/src/views/users/components/MultipleUsersMenu.vue @@ -244,13 +244,13 @@ export default { applyAction(filtered, approveAccountFn) }, confirmAccounts: () => { - const filtered = this.selectedUsers.filter(user => this.isLocalUser(user) && user.confirmation_pending) + const filtered = this.selectedUsers.filter(user => this.isLocalUser(user) && !user.is_confirmed) const confirmAccountFn = async(users) => await this.$store.dispatch('ConfirmUsersEmail', { users }) applyAction(filtered, confirmAccountFn) }, resendConfirmation: () => { - const filtered = this.selectedUsers.filter(user => this.isLocalUser(user) && user.confirmation_pending) + const filtered = this.selectedUsers.filter(user => this.isLocalUser(user) && !user.is_confirmed) const resendConfirmationFn = async(users) => await this.$store.dispatch('ResendConfirmationEmail', users) applyAction(filtered, resendConfirmationFn) diff --git a/src/views/users/index.vue b/src/views/users/index.vue index 4baaed01890fb793f89608ed6d211c59fe963d41..d20161b481d933467973d2ccd897e31cd542ae80 100644 --- a/src/views/users/index.vue +++ b/src/views/users/index.vue @@ -77,7 +77,7 @@ <span>{{ isDesktop ? $t('users.moderator') : getFirstLetter($t('users.moderator')) }}</span> </el-tag> <el-tooltip :content="$t('users.unconfirmedEmail')" effect="dark"> - <el-tag v-if="scope.row.confirmation_pending" type="info"> + <el-tag v-if="!scope.row.is_confirmed" type="info"> {{ isDesktop ? $t('users.unconfirmed') : getFirstLetter($t('users.unconfirmed')) }} </el-tag> </el-tooltip>