From 1c341bed6a394510896758cbf0d2d9fc67244a6d Mon Sep 17 00:00:00 2001 From: Jeff Hufford Date: Sun, 10 Sep 2017 15:34:43 -0700 Subject: [PATCH 1/4] Update main.js --- src/main.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main.js b/src/main.js index 4562b9032..1e31d3eb7 100644 --- a/src/main.js +++ b/src/main.js @@ -11,7 +11,9 @@ import VuesticPlugin from 'src/components/vuestic-components/vuestic-components- Vue.use(VuesticPlugin) Vue.use(BootstrapVue) -Vue.use(VeeValidate) + +// NOTE: workaround for VeeValidate + vuetable-2 +Vue.use(VeeValidate, {fieldsBagName: 'formFields'}) sync(store, router) From f8c1caf15e036ee290b605ce0c2f72f4465b4e5a Mon Sep 17 00:00:00 2001 From: Jeff Hufford Date: Sun, 10 Sep 2017 15:39:03 -0700 Subject: [PATCH 2/4] Update SetupProfileTab.vue --- .../dashboard/setup-profile-tab/SetupProfileTab.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/dashboard/setup-profile-tab/SetupProfileTab.vue b/src/components/dashboard/setup-profile-tab/SetupProfileTab.vue index 640a31c74..1685eb57f 100644 --- a/src/components/dashboard/setup-profile-tab/SetupProfileTab.vue +++ b/src/components/dashboard/setup-profile-tab/SetupProfileTab.vue @@ -110,8 +110,8 @@ methods: { isFormFieldValid (field) { let isValid = false - if (this.fields[field]) { - isValid = this.fields[field].validated && this.fields[field].valid + if (this.formFields[field]) { + isValid = this.formFields[field].validated && this.formFields[field].valid } return isValid }, From bca51b7e46fc44a45c12ddb8d3241d5e91f09dcb Mon Sep 17 00:00:00 2001 From: Jeff Hufford Date: Sun, 10 Sep 2017 15:40:32 -0700 Subject: [PATCH 3/4] Update FormElements.vue --- src/components/forms/form-elements/FormElements.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/forms/form-elements/FormElements.vue b/src/components/forms/form-elements/FormElements.vue index 915a5de33..67bfdab17 100644 --- a/src/components/forms/form-elements/FormElements.vue +++ b/src/components/forms/form-elements/FormElements.vue @@ -285,8 +285,9 @@ computed: { isSuccessfulEmailValid () { let isValid = false - if (this.fields.successfulEmail) { - isValid = this.fields.successfulEmail.validated && this.fields.successfulEmail.valid + if ( + .successfulEmail) { + isValid = this.formFields.successfulEmail.validated && this.formFields.successfulEmail.valid } return isValid } From 0eed3c32bc5771f7425f96f8aab6ad161e937c6f Mon Sep 17 00:00:00 2001 From: Jeff Hufford Date: Sun, 10 Sep 2017 15:41:06 -0700 Subject: [PATCH 4/4] Update FormWizard.vue --- src/components/forms/form-wizard/FormWizard.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/forms/form-wizard/FormWizard.vue b/src/components/forms/form-wizard/FormWizard.vue index 0af15e3a5..853db5ecc 100644 --- a/src/components/forms/form-wizard/FormWizard.vue +++ b/src/components/forms/form-wizard/FormWizard.vue @@ -368,8 +368,8 @@ methods: { isFormFieldValid (field) { let isValid = false - if (this.fields[field]) { - isValid = this.fields[field].validated && this.fields[field].valid + if (this.formFields[field]) { + isValid = this.formFields[field].validated && this.formFields[field].valid } return isValid },