From 559099ee05ccc8c5e904582235a3ab53149cc07c Mon Sep 17 00:00:00 2001 From: nathan Date: Thu, 29 Feb 2024 14:32:58 -0700 Subject: [PATCH] Fix filemanager customfield was not handling required properly, blocking submit --- api/js/etemplate/et2_extension_customfields.ts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/api/js/etemplate/et2_extension_customfields.ts b/api/js/etemplate/et2_extension_customfields.ts index 3d4da20aea..d4236cd97a 100644 --- a/api/js/etemplate/et2_extension_customfields.ts +++ b/api/js/etemplate/et2_extension_customfields.ts @@ -798,23 +798,28 @@ export class et2_customfields_list extends et2_valueWidget implements et2_IDetac .appendTo(row); // Create upload widget - let widget = this.widgets[field_name] = et2_createWidget(attrs.type ? attrs.type : field.type, attrs, this); + let widget = this.widgets[field_name] = et2_createWidget(attrs.type ? attrs.type : field.type, {...attrs}, this); // This controls where the widget is placed in the DOM this.rows[attrs.id] = cf[0]; jQuery(widget.getDOMNode(widget)).css('vertical-align','top'); // Add a link to existing VFS file - const select_attrs = jQuery.extend({}, - attrs, + const required = attrs.needed ?? attrs.required; + delete attrs.needed; + const select_attrs = { + ...attrs, // Filemanager select - { + ...{ path: '~', mode: widget.options.multiple ? 'open-multiple' : 'open', method: 'EGroupware\\Api\\Etemplate\\Widget\\Link::ajax_link_existing', methodId: attrs.path, buttonLabel: this.egw().lang('Link') - }, {type: 'et2-vfs-select'}); + }, + type: 'et2-vfs-select', + required: required + } select_attrs.id = attrs.id + '_vfs_select'; // This controls where the button is placed in the DOM