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

Fix label customfield did not get extra options set

Browse Source
This commit is contained in:
nathan 2024-08-08 10:57:32 -06:00
parent b6627a482f
commit f7bf94404e
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/js/etemplate/et2_extension_customfields.ts
View File

@ -342,6 +342,7 @@ export class et2_customfields_list extends et2_valueWidget implements et2_IDetac
if(!no_skip) continue; if(!no_skip) continue;
} }
this.rows[id] = cf[0]; this.rows[id] = cf[0];
let labelWidget = null;
if(this.getType() == 'customfields-list') { if(this.getType() == 'customfields-list') {
// No label, custom widget // No label, custom widget
@ -364,7 +365,7 @@ export class et2_customfields_list extends et2_valueWidget implements et2_IDetac
{ {
label_td.attr('colspan', 2).addClass('et2_customfield_'+(attrs.type || field.type)); label_td.attr('colspan', 2).addClass('et2_customfield_'+(attrs.type || field.type));
} }
et2_createWidget("label", {id: id + "_label", value: label.trim(), for: id}, this); labelWidget = et2_createWidget("label", {id: id + "_label", value: label.trim(), for: id}, this);
} }
const type = attrs.type ? attrs.type : field.type; const type = attrs.type ? attrs.type : field.type;
@ -405,9 +406,20 @@ export class et2_customfields_list extends et2_valueWidget implements et2_IDetac
} }
if(typeof attrs.size !== 'undefined' && ['small', 'medium', 'large'].indexOf(attrs.size) === -1) if(typeof attrs.size !== 'undefined' && ['small', 'medium', 'large'].indexOf(attrs.size) === -1)
{ {
if (attrs.size > 0) attrs.width = attrs.size+'em'; if(attrs.size > 0)
{
attrs.width = attrs.size + 'em';
}
delete attrs.size; delete attrs.size;
} }
if(['label', 'header'].indexOf(attrs.type || field.type) !== -1 && labelWidget)
{
// Re-use label, don't create new
delete attrs.id;
Object.assign(labelWidget, {for: undefined, ...attrs});
}
else
{
//this.widgets[field_name] = loadWebComponent('et2-' + type, attrs, null); //this.widgets[field_name] = loadWebComponent('et2-' + type, attrs, null);
// et2_extension_customfields.getDOMNode() needs webcomponent to have ID before it can put it in // et2_extension_customfields.getDOMNode() needs webcomponent to have ID before it can put it in
let wc = <LitElement>loadWebComponent('et2-' + type, attrs, this); let wc = <LitElement>loadWebComponent('et2-' + type, attrs, this);
@ -417,6 +429,7 @@ export class et2_customfields_list extends et2_valueWidget implements et2_IDetac
this.widgets[field_name] = wc; this.widgets[field_name] = wc;
}) })
} }
}
else if(typeof et2_registry[type] !== 'undefined') else if(typeof et2_registry[type] !== 'undefined')
{ {
this.widgets[field_name] = et2_createWidget(type, attrs, this); this.widgets[field_name] = et2_createWidget(type, attrs, this);