viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings get rid of required

Browse Source
This commit is contained in:
Yuri Kuznetsov
2019-12-11 16:29:15 +02:00
parent a337aef8a7
commit bf7f0d5cbc
3 changed files with 104 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
application/Espo/Resources/metadata/authenticationMethods/LDAP.json
View File

@@ -34,6 +34,39 @@
],
"dynamicLogic": {
"fields": {
"ldapHost": {
"required": {
"conditionGroup": [
{
"type": "equals",
"attribute": "authenticationMethod",
"value": "LDAP"
}
]
}
},
"ldapUserNameAttribute": {
"required": {
"conditionGroup": [
{
"type": "equals",
"attribute": "authenticationMethod",
"value": "LDAP"
}
]
}
},
"ldapUserObjectClass": {
"required": {
"conditionGroup": [
{
"type": "equals",
"attribute": "authenticationMethod",
"value": "LDAP"
}
]
}
},
"ldapUsername": {
"visible": {
"conditionGroup": [
@@ -42,6 +75,14 @@
"attribute": "ldapAuth"
}
]
},
"required": {
"conditionGroup": [
{
"type": "isTrue",
"attribute": "ldapAuth"
}
]
}
},
"ldapPassword": {
@@ -94,6 +135,14 @@
"attribute": "ldapCreateEspoUser"
}
]
},
"required": {
"conditionGroup": [
{
"type": "isTrue",
"attribute": "ldapCreateEspoUser"
}
]
}
},
"ldapUserFirstNameAttribute": {
@@ -104,6 +153,14 @@
"attribute": "ldapCreateEspoUser"
}
]
},
"required": {
"conditionGroup": [
{
"type": "isTrue",
"attribute": "ldapCreateEspoUser"
}
]
}
},
"ldapUserLastNameAttribute": {
@@ -114,6 +171,14 @@
"attribute": "ldapCreateEspoUser"
}
]
},
"required": {
"conditionGroup": [
{
"type": "isTrue",
"attribute": "ldapCreateEspoUser"
}
]
}
},
"ldapUserEmailAddressAttribute": {
@@ -124,6 +189,14 @@
"attribute": "ldapCreateEspoUser"
}
]
},
"required": {
"conditionGroup": [
{
"type": "isTrue",
"attribute": "ldapCreateEspoUser"
}
]
}
},
"ldapUserPhoneNumberAttribute": {
@@ -134,6 +207,14 @@
"attribute": "ldapCreateEspoUser"
}
]
},
"required": {
"conditionGroup": [
{
"type": "isTrue",
"attribute": "ldapCreateEspoUser"
}
]
}
},
"ldapUserTeams": {

18
application/Espo/Resources/metadata/entityDefs/Settings.json
View File

@@ -101,12 +101,10 @@
"type": "int",
"min": 0,
"max": 9999,
"required": true,
"default": 587
},
"smtpAuth": {
"type": "bool",
"default": true
"type": "bool"
},
"smtpSecurity": {
"type": "enum",
@@ -114,8 +112,7 @@
"options": ["", "SSL", "TLS"]
},
"smtpUsername": {
"type": "varchar",
"required": true
"type": "varchar"
},
"smtpPassword": {
"type": "password"
@@ -193,8 +190,7 @@
"type": "bool"
},
"ldapHost": {
"type": "varchar",
"required": true
"type": "varchar"
},
"ldapPort": {
"type": "varchar",
@@ -210,7 +206,6 @@
},
"ldapUsername": {
"type": "varchar",
"required": true,
"tooltip": true
},
"ldapPassword": {
@@ -265,37 +260,30 @@
},
"ldapUserNameAttribute": {
"type": "varchar",
"required": true,
"tooltip": true
},
"ldapUserObjectClass": {
"type": "varchar",
"required": true,
"tooltip": true
},
"ldapUserFirstNameAttribute": {
"type": "varchar",
"required": true,
"tooltip": true
},
"ldapUserLastNameAttribute": {
"type": "varchar",
"required": true,
"tooltip": true
},
"ldapUserTitleAttribute": {
"type": "varchar",
"required": true,
"tooltip": true
},
"ldapUserEmailAddressAttribute": {
"type": "varchar",
"required": true,
"tooltip": true
},
"ldapUserPhoneNumberAttribute": {
"type": "varchar",
"required": true,
"tooltip": true
},
"ldapUserDefaultTeam": {

20
client/src/views/admin/outbound-emails.js
View File

@@ -46,6 +46,18 @@ define('views/admin/outbound-emails', 'views/settings/record/edit', function (De
attribute: 'smtpAuth',
}
]
},
required: {
conditionGroup: [
{
type: 'isNotEmpty',
attribute: 'smtpServer',
},
{
type: 'isTrue',
attribute: 'smtpAuth',
}
]
}
},
smtpPassword: {
@@ -70,6 +82,14 @@ define('views/admin/outbound-emails', 'views/settings/record/edit', function (De
attribute: 'smtpServer',
},
]
},
required: {
conditionGroup: [
{
type: 'isNotEmpty',
attribute: 'smtpServer',
},
]
}
},
smtpSecurity: {