extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-24 20:01:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Validation changes:

Browse Source 
- Fix multiplying messages on focus/blur
- Server-side (Manual) messages do not block submit.  Server set it, we'll let server check it.
This commit is contained in:
nathan 2023-04-13 15:06:31 -06:00
parent e4592e822e
commit 3423e680b8
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
api/js/etemplate/Et2InputWidget/Et2InputWidget.ts
View File

@ -285,7 +285,17 @@ const Et2InputWidgetMixin = <T extends Constructor<LitElement>>(superclass : T)
} }
// Collect any ManualMessages // Collect any ManualMessages
this._messagesHeldWhileFocused = (this.validators || []).filter((validator) => (validator instanceof ManualMessage)); this._messagesHeldWhileFocused = (this.validators || []).filter(
(validator) => (validator instanceof ManualMessage)
);
// Remove ManualMessages from validators list
for(let i = 0; i < this.validators.length; i++)
{
if(this._messagesHeldWhileFocused.indexOf(this.validators[i]) != -1)
{
this.validators.splice(i, 1);
}
}
this.updateComplete.then(() => this.updateComplete.then(() =>
{ {
@ -501,8 +511,10 @@ const Et2InputWidgetMixin = <T extends Constructor<LitElement>>(superclass : T)
* *
* We handle validation errors from the server with ManualMessages, which always "fail". * We handle validation errors from the server with ManualMessages, which always "fail".
* If the value is empty, we only validate if the field is required. * If the value is empty, we only validate if the field is required.
*
* @param skipManual Do not run any manual validators, used during submit check. We don't want manual validators to block submit.
*/ */
async validate() async validate(skipManual = false)
{ {
if(this.readonly) if(this.readonly)
{ {
@ -563,7 +575,10 @@ const Et2InputWidgetMixin = <T extends Constructor<LitElement>>(superclass : T)
// Run manual validation messages just once, doesn't usually matter what the value is // Run manual validation messages just once, doesn't usually matter what the value is
if(validator instanceof ManualMessage) if(validator instanceof ManualMessage)
{ {
doCheck(values, validator); if(!skipManual)
{
doCheck(values, validator);
}
} }
// Only validate if field is required, or not required and has a value // Only validate if field is required, or not required and has a value
// Don't bother to validate empty fields // Don't bother to validate empty fields