extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-24 20:01:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

List each cf as a separate column when sending to server, apps expect it

Browse Source
This commit is contained in:
Nathan Gray 2011-10-17 20:40:18 +00:00
parent a8531017bd
commit b704db187f
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etemplate/js/et2_extension_nextmatch.js
View File

@ -379,6 +379,7 @@ var et2_nextmatch = et2_DOMWidget.extend(et2_IResizeable, {
var visibility = colMgr.getColumnVisibilitySet(); var visibility = colMgr.getColumnVisibilitySet();
var colDisplay = []; var colDisplay = [];
var colSize = {}; var colSize = {};
var custom_fields = [];
// visibility is indexed by internal ID, widget is referenced by position, preference needs name // visibility is indexed by internal ID, widget is referenced by position, preference needs name
for(var i = 0; i < colMgr.columns.length; i++) for(var i = 0; i < colMgr.columns.length; i++)
@ -388,6 +389,13 @@ var et2_nextmatch = et2_DOMWidget.extend(et2_IResizeable, {
if(colName) { if(colName) {
if(visibility[colMgr.columns[i].id].visible) colDisplay.push(colName); if(visibility[colMgr.columns[i].id].visible) colDisplay.push(colName);
if(colMgr.columns[i].fixedWidth) colSize[colName] = colMgr.columns[i].fixedWidth; if(colMgr.columns[i].fixedWidth) colSize[colName] = colMgr.columns[i].fixedWidth;
// Server side wants each cf listed as a seperate column
if(widget.instanceOf(et2_nextmatch_customfields))
{
for(name in widget.options.fields) {
if(widget.options.fields[name]) custom_fields.push("#"+name);
}
}
} else if (colMgr.columns[i].fixedWidth) { } else if (colMgr.columns[i].fixedWidth) {
et2_debug("info", "Could not save column width - no name", colMgr.columns[i].id); et2_debug("info", "Could not save column width - no name", colMgr.columns[i].id);
} }
@ -405,6 +413,10 @@ var et2_nextmatch = et2_DOMWidget.extend(et2_IResizeable, {
// Update query value, so data source can use visible columns to exclude expensive sub-queries // Update query value, so data source can use visible columns to exclude expensive sub-queries
var oldCols = this.activeFilters.selectcols ? this.activeFilters.selectcols : []; var oldCols = this.activeFilters.selectcols ? this.activeFilters.selectcols : [];
// Server side wants each cf listed as a seperate column
jQuery.merge(colDisplay, custom_fields);
this.activeFilters.selectcols = colDisplay; this.activeFilters.selectcols = colDisplay;
// We don't need to re-query if they've removed a column // We don't need to re-query if they've removed a column