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

Fix customfield column sometimes disappearing from print

Browse Source
This commit is contained in:
Nathan Gray 2016-05-10 17:12:39 +00:00
parent e7763189b1
commit 5dc798da7f
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
api/js/etemplate/et2_extension_nextmatch.js
View File

@ -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);
}
}
}
}