fixed: Login error message improved and necessary translation string added
This commit is contained in:
parent
19d7786f71
commit
a3b365d7ac
14 changed files with 36 additions and 25 deletions
|
|
@ -37,6 +37,7 @@
|
|||
:error-messages="userErrorMessage"
|
||||
required
|
||||
v-on:keyup.enter="$refs.password.focus()"
|
||||
v-on:keydown="hasError=false"
|
||||
></v-text-field>
|
||||
<v-text-field
|
||||
prepend-inner-icon="$vuetify.icons.password"
|
||||
|
|
@ -51,6 +52,7 @@
|
|||
:error="passErrorMessage != null"
|
||||
:error-messages="passErrorMessage"
|
||||
required
|
||||
v-on:keydown="hasError=false"
|
||||
v-on:keyup.enter="
|
||||
() => {
|
||||
if (isValid && !loading) {
|
||||
|
|
@ -59,6 +61,7 @@
|
|||
}
|
||||
"
|
||||
></v-text-field>
|
||||
<div class="error--text" v-if="hasError">{{ this.message }}</div>
|
||||
<v-checkbox
|
||||
class="mt-0"
|
||||
v-model="rememberMe"
|
||||
|
|
@ -102,6 +105,7 @@ export default {
|
|||
message: "",
|
||||
userErrorMessage: null,
|
||||
passErrorMessage: null,
|
||||
hasError: false
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
|
|
@ -142,19 +146,7 @@ export default {
|
|||
this.passErrorMessage = null;
|
||||
},
|
||||
deep: true,
|
||||
},
|
||||
message() {
|
||||
if (this.message && this.message.toLowerCase().includes("user")) {
|
||||
this.userErrorMessage = this.message;
|
||||
} else {
|
||||
this.userErrorMessage = null;
|
||||
}
|
||||
if (this.message && this.message.toLowerCase().includes("pass")) {
|
||||
this.passErrorMessage = this.message;
|
||||
} else {
|
||||
this.passErrorMessage = null;
|
||||
}
|
||||
},
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
handleLogin() {
|
||||
|
|
@ -189,6 +181,10 @@ export default {
|
|||
(error.data && error.data.error) ||
|
||||
error.message ||
|
||||
error.toString();
|
||||
if(error.data.errcode ==='M_FORBIDDEN') {
|
||||
this.message = this.$i18n.messages[this.$i18n.locale].login.invalid_message;
|
||||
this.hasError = true;
|
||||
}
|
||||
console.log("Message set to ", this.message);
|
||||
}
|
||||
);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue