Merge branch 'release/1.2.9'

calendz · Mar 13, 2020 · 71d344e · 71d344e
2 parents fdcbe3f + 1b176e1
commit 71d344e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "calendz-front",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

diff --git a/src/plugins/veeCustom/customValidators.js b/src/plugins/veeCustom/customValidators.js
@@ -1,7 +1,7 @@
 import { Validator } from 'vee-validate'
 
 Validator.extend('email_valid_school', {
-  validate: value => value.includes('@epsi.fr') || value.includes('@wis.fr') || value.includes('@etudes-wis.net')
+  validate: value => value.includes('@epsi.fr') || value.includes('@wis.fr') || value.includes('@ecoles-wis.net' || value.includes('@ecoles-wis.net'))
 })
 
 Validator.extend('contains_one_number', {

diff --git a/src/views/Pages/Auth/Register.vue b/src/views/Pages/Auth/Register.vue
@@ -229,7 +229,7 @@ export default {
     },
     guessSchoolFromEmail (email) {
       if (email.includes('@epsi.fr')) return 'EPSI'
-      if (email.includes('@wis.fr') || email.includes('@etudes-wis.net')) return 'WIS'
+      if (email.includes('@wis.fr') || email.includes('@ecoles-wis.net')) return 'WIS'
     },
     showAlert (title) {
       swal({

diff --git a/src/views/Pages/Dashboard/Admin/UserManagement.vue b/src/views/Pages/Dashboard/Admin/UserManagement.vue
@@ -528,7 +528,7 @@ export default {
     },
     guessSchoolFromEmail (email) {
       if (email.includes('@epsi.fr')) return 'EPSI'
-      if (email.includes('@wis.fr') || email.includes('@etudes-wis.net')) return 'WIS'
+      if (email.includes('@wis.fr') || email.includes('@ecoles-wis.net')) return 'WIS'
     }
   }
 }