EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
URL Multiple field: Protocol Required param
Yuriia7d21b1ffec8
diff --git a/application/Espo/Classes/FieldValidators/UrlMultipleType.php b/application/Espo/Classes/FieldValidators/UrlMultipleType.phpindex 7e996342c6..3f4646e9d8 100644--- a/application/Espo/Classes/FieldValidators/UrlMultipleType.php+++ b/application/Espo/Classes/FieldValidators/UrlMultipleType.php@@ -47,6 +47,22 @@ class UrlMultipleType extends ArrayTypepublic function checkPattern(Entity $entity, string $field, ?string $validationValue): bool{+ $value = $entity->get($field);++ if (is_array($value)) {+ $allValid = true;++ foreach ($value as $it) {+ if (is_string($it) && filter_var($it, FILTER_VALIDATE_URL) === false) {+ $allValid = false;+ }+ }++ if ($allValid) {+ return true;+ }+ }+/** @var string $pattern */$pattern = $this->metadata->get(['app', 'regExpPatterns', 'uriOptionalProtocol', 'pattern']);diff --git a/application/Espo/Classes/FieldValidators/UrlType.php b/application/Espo/Classes/FieldValidators/UrlType.phpindex 05b5bb425f..6ffc7986eb 100644--- a/application/Espo/Classes/FieldValidators/UrlType.php+++ b/application/Espo/Classes/FieldValidators/UrlType.php@@ -69,6 +69,10 @@ class UrlTypereturn filter_var($value, FILTER_VALIDATE_URL) !== false;}+ if (filter_var($value, FILTER_VALIDATE_URL) !== false) {+ return true;+ }+/** @var string $pattern */$pattern = $this->metadata->get(['app', 'regExpPatterns', 'uriOptionalProtocol', 'pattern']);diff --git a/application/Espo/Resources/metadata/fields/urlMultiple.json b/application/Espo/Resources/metadata/fields/urlMultiple.jsonindex 2151334d66..bb5fd2934b 100644--- a/application/Espo/Resources/metadata/fields/urlMultiple.json+++ b/application/Espo/Resources/metadata/fields/urlMultiple.json@@ -17,6 +17,10 @@"default": false,"tooltip": "urlStrip"},+ {+ "name": "protocolRequired",+ "type": "bool"+ },{"name": "audited","type": "bool"diff --git a/client/src/views/fields/url-multiple.ts b/client/src/views/fields/url-multiple.tsindex 5ba0450fbb..5e7713a922 100644--- a/client/src/views/fields/url-multiple.ts+++ b/client/src/views/fields/url-multiple.ts@@ -53,11 +53,44 @@ class UrlMultipleFieldView<protected displayAsList = trueprotected defaultProtocol = 'https:'+ protected optionalProtocol: boolean = true+protected setup() {super.setup();this.noEmptyString = true;- this.params.pattern = '$uriOptionalProtocol';++ if (this.params.protocolRequired) {+ this.optionalProtocol = false;+ }+ }++ private isValidUrl(value: string): boolean {+ if (!this.optionalProtocol) {+ try {+ new URL(value);++ return true;+ } catch (e) {+ return false;+ }+ }++ try {+ new URL(value);++ return true;+ } catch (e) {}++ const pattern = this.getMetadata().get(['app', 'regExpPatterns', 'uriOptionalProtocol', 'pattern']) as string;++ const regExp = new RegExp('^' + pattern + '$');++ if (regExp.test(value)) {+ return true;+ }++ return false;}protected addValueFromUi(value: string) {@@ -75,6 +108,16 @@ class UrlMultipleFieldView<console.warn(`Malformed URI ${value}.`);}+ if (!this.isValidUrl(value)) {+ const message = this.translate('fieldNotMatchingPattern$uriOptionalProtocol', 'messages')+ .replace('{field}', this.getLabelText());++ setTimeout(() => this.showValidationMessage(message, 'input.select'), 10);++ return;+ }++super.addValueFromUi(value);}diff --git a/client/src/views/fields/url.ts b/client/src/views/fields/url.tsindex 09c31b69c5..e2785afb13 100644--- a/client/src/views/fields/url.ts+++ b/client/src/views/fields/url.ts@@ -214,6 +214,12 @@ class UrlFieldView<}}+ try {+ new URL(value);++ return true;+ } catch (e) {}+const pattern = this.getMetadata().get(['app', 'regExpPatterns', 'uriOptionalProtocol', 'pattern']) as string;const regExp = new RegExp('^' + pattern + '$');