mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 09:05:16 +01:00
Fix customfield column sometimes disappearing from print
This commit is contained in:
parent
e7763189b1
commit
5dc798da7f
@ -2061,20 +2061,22 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
|
||||
if(col.visibility === ET2_COL_VISIBILITY_VISIBLE) columns_selected.push(colName);
|
||||
}
|
||||
// Custom fields get listed separately
|
||||
if(widget.instanceOf(et2_nextmatch_customfields) && col.visibility === ET2_COL_VISIBILITY_VISIBLE)
|
||||
if(widget.instanceOf(et2_nextmatch_customfields))
|
||||
{
|
||||
if(jQuery.isEmptyObject(widget.customfields))
|
||||
delete(columns[colName]);
|
||||
colName = widget.id;
|
||||
if(col.visibility === ET2_COL_VISIBILITY_VISIBLE && !
|
||||
jQuery.isEmptyObject(widget.customfields)
|
||||
)
|
||||
{
|
||||
// No customfields defined, don't show column
|
||||
delete(columns[colName]);
|
||||
continue;
|
||||
}
|
||||
for(var field_name in widget.customfields)
|
||||
{
|
||||
columns[widget.prefix+field_name] = " - "+widget.customfields[field_name].label;
|
||||
if(widget.options.fields[field_name] && columns_selected.indexOf(colName) >= 0)
|
||||
columns[colName] = col.caption;
|
||||
for(var field_name in widget.customfields)
|
||||
{
|
||||
columns_selected.push(et2_customfields_list.prototype.prefix+field_name);
|
||||
columns[widget.prefix+field_name] = " - "+widget.customfields[field_name].label;
|
||||
if(widget.options.fields[field_name] && columns_selected.indexOf(colName) >= 0)
|
||||
{
|
||||
columns_selected.push(et2_customfields_list.prototype.prefix+field_name);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user