holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Et2Widget: Add modifications in when transforming attributes

Browse Source
This commit is contained in:
nathan 2022-04-20 14:09:01 -06:00
parent dc44888d36
commit 94f843cd50
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/js/etemplate/Et2Widget/Et2Widget.ts
View File

@ -774,6 +774,12 @@ const Et2WidgetMixin = (superClass) =>
transformAttributes(attrs) transformAttributes(attrs)
{ {
transformAttributes(this, this.getArrayMgr("content"), attrs); transformAttributes(this, this.getArrayMgr("content"), attrs);
// Add in additional modifications
if(this.id && this.getArrayMgr("modifications").getEntry(this.id))
{
transformAttributes(this, this.getArrayMgr("content"), this.getArrayMgr("modifications").getEntry(this.id));
}
} }
iterateOver(_callback : Function, _context, _type) iterateOver(_callback : Function, _context, _type)
@ -1326,6 +1332,11 @@ function transformAttributes(widget, mgr : et2_arrayMgr, attributes)
switch(typeof property === "object" ? property.type : property) switch(typeof property === "object" ? property.type : property)
{ {
case Boolean: case Boolean:
if(typeof attrValue == "boolean")
{
// Already boolean, nothing needed
break;
}
// If the attribute is marked as boolean, parse the // If the attribute is marked as boolean, parse the
// expression as bool expression. // expression as bool expression.
attrValue = mgr ? mgr.parseBoolExpression(attrValue) : attrValue; attrValue = mgr ? mgr.parseBoolExpression(attrValue) : attrValue;
@ -1347,7 +1358,7 @@ function transformAttributes(widget, mgr : et2_arrayMgr, attributes)
} }
break; break;
default: default:
attrValue = mgr ? mgr.expandName(attrValue) : attrValue; attrValue = mgr ? mgr.expandName("" + attrValue) : attrValue;
if(attrValue && !attributes.no_lang && widget_class.translate[attribute]) if(attrValue && !attributes.no_lang && widget_class.translate[attribute])
{ {
// allow attribute to contain multiple translated sub-strings eg: {Firstname}.{Lastname} // allow attribute to contain multiple translated sub-strings eg: {Firstname}.{Lastname}