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

- Fix duplicated row from template above nextmatch

Browse Source 
- Fix favorite in wrong place
This commit is contained in:
nathan 2021-11-18 14:37:23 -07:00
parent 7831529ecb
commit 105b0705b1
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/js/etemplate/et2_extension_nextmatch.ts
View File

@ -1759,17 +1759,9 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
{ {
continue; continue;
} }
if(typeof _row[x] != "undefined" && _row[x].widget)
{
columnWidgets[x] = _row[x].widget;
// Append the widget to this container columnWidgets[x] = _row[x].widget;
this.addChild(_row[x].widget);
}
else
{
columnWidgets[x] = _row[x].widget;
}
// Pass along column alignment // Pass along column alignment
if(_row[x].align && columnWidgets[x]) if(_row[x].align && columnWidgets[x])
{ {
@ -3852,6 +3844,10 @@ export class et2_nextmatch_header_bar extends et2_DOMWidget implements et2_INext
{ {
return this.search_box[0]; return this.search_box[0];
} }
if(_sender == this.favorites)
{
return egwIsMobile() ? this.search_box.find('.nm_favorites_div').show() : this.right_div;
}
if(_sender.id == 'export') if(_sender.id == 'export')
{ {
return this.right_div[0]; return this.right_div[0];
@ -3870,9 +3866,9 @@ export class et2_nextmatch_header_bar extends et2_DOMWidget implements et2_INext
for(let header of this.headers) for(let header of this.headers)
{ {
if(header && header.getDOMNode && header.getDOMNode(this)) if(header && header.getDOMNode && header.getDOMNode(_sender))
{ {
return header.getDOMNode(this); return header.getDOMNode(_sender);
} }
} }
return null; return null;