From dc10c20fe3c93bef28e72023e48e79c044ee1e77 Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 3 Jul 2023 07:29:58 +0200 Subject: [PATCH] refs #5334 email validate --- modules/worker/back/models/department.js | 7 ------- .../worker/front/department/basic-data/index.html | 14 +++++--------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/modules/worker/back/models/department.js b/modules/worker/back/models/department.js index ff88a34d08..5a927fc640 100644 --- a/modules/worker/back/models/department.js +++ b/modules/worker/back/models/department.js @@ -1,11 +1,4 @@ module.exports = Self => { - Self.validatesFormatOf('Email', { - message: 'Invalid email', - allowNull: true, - allowBlank: true, - with: /^[\W]*([\w+\-.%]+@[\w\-.]+\.[A-Za-z]{1,61}[\W]*,{1}[\W]*)*([\w+\-.%]+@[\w\-.]+\.[A-Za-z]{1,61})[\W]*$/ - }); - require('../methods/department/getLeaves')(Self); require('../methods/department/createChild')(Self); require('../methods/department/removeChild')(Self); diff --git a/modules/worker/front/department/basic-data/index.html b/modules/worker/front/department/basic-data/index.html index ad3dedcb31..bb27ae0805 100644 --- a/modules/worker/front/department/basic-data/index.html +++ b/modules/worker/front/department/basic-data/index.html @@ -20,15 +20,13 @@ vn-one label="Name" ng-model="$ctrl.department.name" - vn-name="Name" - rule> + vn-name="Name"> + vn-name="Code"> @@ -36,15 +34,13 @@ vn-one label="Chat" ng-model="$ctrl.department.chatName" - vn-name="Chat" - rule> + vn-name="Chat"> - + vn-name="Email">