You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2020/10/12 08:00:21 UTC
[incubator-dolphinscheduler] 01/01: Revert
"[1.3.3-release][fix-3835][ui] When the tenantName contains "<",
the tenant drop-down list is blankadd verify tenant name cannot contain
special characters."
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch revert-3870-1.3.3-bug-ui-fix-3835
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit ac8d5644d5d5de595f7718e631a33efaa003e563
Author: bao liang <29...@users.noreply.github.com>
AuthorDate: Mon Oct 12 15:58:05 2020 +0800
Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters."
---
.../pages/security/pages/tenement/_source/createTenement.vue | 9 +--------
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js | 1 -
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js | 1 -
3 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
index 213109d..a258b6c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
@@ -149,13 +149,6 @@
this.$message.warning(`${i18n.$t('Please enter tenant Name')}`)
return false
}
- // Verify tenant name cannot contain special characters
- let isSpecial = /[~#^$@%&!*()<>《》:;'"{}【】 ]/gi
- if (isSpecial.test(this.tenantName)) {
- this.$message.warning(`${i18n.$t('Please enter tenant name without special characters')}`)
- return false
- }
-
return true
},
_submit () {
@@ -202,4 +195,4 @@
},
components: { mPopup, mListBoxF }
}
-</script>
+</script>
\ No newline at end of file
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index 2680af1..de31fc2 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -177,7 +177,6 @@ export default {
'Please enter tenant Name': 'Please enter tenant Name',
'The tenant code. Only letters or a combination of letters and numbers are allowed': 'The tenant code. Only letters or a combination of letters and numbers are allowed',
'The tenant code cannot be all numbers': 'The tenant code cannot be all numbers',
- 'Please enter tenant name without special characters': 'Please enter tenant name without special characters',
'Edit User': 'Edit User',
Tenant: 'Tenant',
Email: 'Email',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 131c260..d6a6f82 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -179,7 +179,6 @@ export default {
'Please enter tenant code': '请输入租户编码',
'Please enter tenant Name': '请输入租户名称',
'The tenant code. Only letters or a combination of letters and numbers are allowed': '租户编码只允许字母或字母与数字组合',
- 'Please enter tenant name without special characters': '请输入不包含特殊字符的租户名称',
'Edit User': '编辑用户',
Tenant: '租户',
Email: '邮件',