fixed validation in

Neeraj Sharma
1 parent e0f163768c
Showing 1 changed file with 5 additions and 2 deletions Show diff stats
src/pages/Administrator/resetPassword.vue
@@ -41,7 +41,7 @@
                     v-model="resetPassword.confirmPassword"
                     :rules="rePasswordRule"
                     :error-messages="errors.collect('password2')"
-                    v-validate="{ required: true, is: resetPassword.newPassword }"
+                    v-validate="{ required: false, is: resetPassword.newPassword }"
                     data-vv-name="password2"
                     data-vv-as="password"
                     label="Re-Password"
@@ -109,7 +109,10 @@ export default {
   },
   methods: {
     reset() {
-      if (this.$refs.form.validate()) {
+      if (
+        this.$refs.form.validate() &&
+        this.resetPassword.confirmPassword === resetPassword.newPassword
+      ) {
         this.loading = true;
         this.resetPassword.roleName = this.resetPassword.name;
         http()
...	...	@@ -41,7 +41,7 @@
41	41	v-model="resetPassword.confirmPassword"
42	42	:rules="rePasswordRule"
43	43	:error-messages="errors.collect('password2')"
44		- v-validate="{ required: true, is: resetPassword.newPassword }"
	44	+ v-validate="{ required: false, is: resetPassword.newPassword }"
45	45	data-vv-name="password2"
46	46	data-vv-as="password"
47	47	label="Re-Password"
...	...	@@ -109,7 +109,10 @@ export default {
109	109	},
110	110	methods: {
111	111	reset() {
112		- if (this.$refs.form.validate()) {
	112	+ if (
	113	+ this.$refs.form.validate() &&
	114	+ this.resetPassword.confirmPassword === resetPassword.newPassword
	115	+ ) {
113	116	this.loading = true;
114	117	this.resetPassword.roleName = this.resetPassword.name;
115	118	http()
...	...