extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-18 12:41:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix customfield column size preference not used

Browse Source
This commit is contained in:
Ralf Becker 2014-09-09 09:57:25 +00:00
parent d38753a97f
commit cfd90f064c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etemplate/js/et2_extension_nextmatch.js
View File

@ -758,6 +758,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
var columnDisplay = prefs.visible; var columnDisplay = prefs.visible;
var size = prefs.size; var size = prefs.size;
var negated = prefs.visible_negated; var negated = prefs.visible_negated;
var colName = '';
// Add in display preferences // Add in display preferences
if(columnDisplay && columnDisplay.length > 0) if(columnDisplay && columnDisplay.length > 0)
@ -765,6 +766,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
RowLoop: RowLoop:
for(var i = 0; i < _row.length; i++) for(var i = 0; i < _row.length; i++)
{ {
colName = '';
if(_row[i].disabled) if(_row[i].disabled)
{ {
_colData[i].disabled = true; _colData[i].disabled = true;
@ -789,7 +791,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
// Resets field visibility too // Resets field visibility too
_row[i].widget._getColumnName(); _row[i].widget._getColumnName();
_colData[i].disabled = negated || jQuery.isEmptyObject(_row[i].widget.options.fields); _colData[i].disabled = negated || jQuery.isEmptyObject(_row[i].widget.options.fields);
continue RowLoop; break;
} }
} }
// Disable if there are no custom fields // Disable if there are no custom fields
@ -798,9 +800,12 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
_colData[i].disabled = true; _colData[i].disabled = true;
continue; continue;
} }
colName = _row[i].widget.id;
}
else
{
colName = this._getColumnName(_row[i].widget);
} }
var colName = this._getColumnName(_row[i].widget);
if(!colName) continue; if(!colName) continue;
if(size[colName]) if(size[colName])