diff options
| author | lain <lain@soykaf.club> | 2019-06-17 07:33:39 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-06-17 07:33:39 +0000 |
| commit | 8d2e63a8e4b51deb7efb1d4fbbd5e20dfb924e73 (patch) | |
| tree | 83eb13056614eec4a963ae5261290cf7e106e467 /src/components/user_settings | |
| parent | 1db3c785d805bfe1e7bb09f2d85875448cb03f9a (diff) | |
| parent | 06c84a9cf347ad841a0630999e12432b5e01866b (diff) | |
Merge branch 'fix-mfa' into 'develop'
fix MFA crashing on user-settings page
See merge request pleroma/pleroma-fe!834
Diffstat (limited to 'src/components/user_settings')
| -rw-r--r-- | src/components/user_settings/mfa.js | 3 | ||||
| -rw-r--r-- | src/components/user_settings/mfa.vue | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/components/user_settings/mfa.js b/src/components/user_settings/mfa.js index 2acee862..d44a3ab7 100644 --- a/src/components/user_settings/mfa.js +++ b/src/components/user_settings/mfa.js @@ -7,6 +7,7 @@ import { mapState } from 'vuex' const Mfa = { data: () => ({ settings: { // current settings of MFA + available: false, enabled: false, totp: false }, @@ -139,7 +140,9 @@ const Mfa = { // fetch settings from server async fetchSettings () { let result = await this.backendInteractor.fetchSettingsMFA() + if (result.error) return this.settings = result.settings + this.settings.available = true return result } }, diff --git a/src/components/user_settings/mfa.vue b/src/components/user_settings/mfa.vue index ded426dd..1f1be60d 100644 --- a/src/components/user_settings/mfa.vue +++ b/src/components/user_settings/mfa.vue @@ -1,5 +1,5 @@ <template> -<div class="setting-item mfa-settings" v-if="readyInit"> +<div class="setting-item mfa-settings" v-if="readyInit && settings.available"> <div class="mfa-heading"> <h2>{{$t('settings.mfa.title')}}</h2> |