extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-09 07:28:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix historylog multi-part entries did not actually show values

Browse Source 
Also deals with some issues setting and missing cleaning of select_options
This commit is contained in:
nathan 2022-07-26 11:41:01 -06:00
parent 9f15169ced
commit de73241166
3 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/Et2Select/Et2SelectReadonly.ts
View File

@ -47,7 +47,7 @@ li {
return { return {
...super.properties, ...super.properties,
value: String, value: String,
select_options: Array select_options: {type: Array}
} }
} }

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

@ -1409,6 +1409,7 @@ function transformAttributes(widget, mgr : et2_arrayMgr, attributes)
} }
break; break;
case Object: case Object:
case Array:
// Leave it alone... // Leave it alone...
break; break;
default: default:

24
api/js/etemplate/et2_widget_historylog.ts
View File

@ -31,7 +31,7 @@ import {et2_dynheight} from "./et2_widget_dynheight";
import {et2_customfields_list} from "./et2_extension_customfields"; import {et2_customfields_list} from "./et2_extension_customfields";
import {et2_selectbox} from "./et2_widget_selectbox"; import {et2_selectbox} from "./et2_widget_selectbox";
import {loadWebComponent} from "./Et2Widget/Et2Widget"; import {loadWebComponent} from "./Et2Widget/Et2Widget";
import {SelectOption} from "./Et2Select/FindSelectOptions"; import {cleanSelectOptions, SelectOption} from "./Et2Select/FindSelectOptions";
/** /**
* eTemplate history log widget displays a list of changes to the current record. * eTemplate history log widget displays a list of changes to the current record.
@ -459,15 +459,15 @@ export class et2_historylog extends et2_valueWidget implements et2_IDataProvider
if(need_box) if(need_box)
{ {
// Multi-part value needs multiple widgets // Multi-part value needs multiple widgets
widget = et2_createWidget('vbox', attrs, this); widget = loadWebComponent('et2-vbox', attrs, this);
for(var i in field) for(let i in field)
{ {
let type = field[i]; let type = field[i];
const child_attrs = jQuery.extend({}, attrs); const child_attrs = jQuery.extend({}, attrs);
if(typeof type === 'object') if(typeof type === 'object')
{ {
child_attrs['select_options'] = field[i]; child_attrs['select_options'] = cleanSelectOptions(field[i]);
type = 'select'; type = 'et2-select';
} }
else else
{ {
@ -481,7 +481,7 @@ export class et2_historylog extends et2_valueWidget implements et2_IDataProvider
} }
else else
{ {
attrs['select_options'] = field; attrs['select_options'] = cleanSelectOptions(field);
} }
} }
// Check for options after the type, ex: link-entry:infolog // Check for options after the type, ex: link-entry:infolog
@ -655,15 +655,6 @@ export class et2_historylog extends et2_valueWidget implements et2_IDataProvider
{ {
nodes = self.fields[_data.status].nodes.clone(); nodes = self.fields[_data.status].nodes.clone();
} }
for(var j = 0; j < widget._children.length; j++)
{
// @ts-ignore
nodes.push(self.fields[_data.status].nodes[j].clone());
if(widget._children[j].instanceOf(et2_diff))
{
self._spanValueColumns(jQuery(this));
}
}
} }
// WebComponent IS the node // WebComponent IS the node
else if(widget && typeof window.customElements.get(widget.localName) != "undefined") else if(widget && typeof window.customElements.get(widget.localName) != "undefined")
@ -711,15 +702,12 @@ export class et2_historylog extends et2_valueWidget implements et2_IDataProvider
if(widget._children.length) if(widget._children.length)
{ {
// Multi-part values // Multi-part values
const box = jQuery(widget.getDOMNode()).clone();
for(var j = 0; j < widget._children.length; j++) for(var j = 0; j < widget._children.length; j++)
{ {
const id = widget._children[j].id; const id = widget._children[j].id;
const widget_value = value ? value[id] || "" : ""; const widget_value = value ? value[id] || "" : "";
widget._children[j].setDetachedAttributes(nodes[j], {value: widget_value}); widget._children[j].setDetachedAttributes(nodes[j], {value: widget_value});
box.append(nodes[j]);
} }
nodes = box;
} }
else else
{ {