TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Validate backend forms client-side (#4804) 

Fixes #4799.
This commit is contained in:
Mike Robinson 2020-04-09 14:24:51 -06:00 committed by GitHub
parent 460aca5b01
commit d69ade86d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/backend/classes/FormField.php
View File

@ -425,6 +425,15 @@ class FormField
$result = array_get($this->attributes, $position, []);
$result = $this->filterAttributes($result, $position);
// Field is required, so add the "required" attribute
if ($position === 'field' && $this->required && (!isset($result['required']) || $result['required'])) {
$result['required'] = '';
}
// The "required" attribute is set and falsy, so unset it
elseif ($position === 'field' && isset($result['required']) && !$result['required']) {
unset($result['required']);
}
return $htmlBuild ? Html::attributes($result) : $result;
}

13
modules/system/assets/js/framework.js
View File

@ -30,12 +30,23 @@ if (window.jQuery.request !== undefined) {
}
/*
* Prepare the options and execute the request
* Prepare the options
*/
var $form = options.form ? $(options.form) : $el.closest('form'),
$triggerEl = !!$form.length ? $form : $el,
context = { handler: handler, options: options }
/*
* Validate the form client-side
*/
if (typeof document.createElement('input').reportValidity == 'function' && $form && $form[0] && !$form[0].checkValidity()) {
$form[0].reportValidity();
return false;
}
/*
* Execute the request
*/
$el.trigger('ajaxSetup', [context])
var _event = jQuery.Event('oc.beforeRequest')
$triggerEl.trigger(_event, context)