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

Use global visibility settings, handle skipped columns in the middle

Browse Source
This commit is contained in:
Nathan Gray
2012-03-19 20:30:38 +00:00
parent e567e6d0bf
commit b89f39785d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
etemplate/js/et2_extension_nextmatch.js
View File

@ -630,6 +630,11 @@ var et2_nextmatch = et2_DOMWidget.extend(et2_IResizeable, {
var column = 0; var column = 0;
for(var i = 0; i < value.length; i++) for(var i = 0; i < value.length; i++)
{ {
// Handle skipped columns
while(value[i] != "col_"+column && column < columnMgr.columns.length)
{
column++;
}
if(visibility[value[i]]) if(visibility[value[i]])
{ {
visibility[value[i]].visible = true; visibility[value[i]].visible = true;
@ -644,7 +649,6 @@ var et2_nextmatch = et2_DOMWidget.extend(et2_IResizeable, {
{ {
visible[field_name] = false; visible[field_name] = false;
} }
i++;
// Turn on selected custom fields - start from 0 in case they're not in order // Turn on selected custom fields - start from 0 in case they're not in order
for(var j = 0; j < value.length; j++) for(var j = 0; j < value.length; j++)
{ {
@ -654,7 +658,6 @@ var et2_nextmatch = et2_DOMWidget.extend(et2_IResizeable, {
} }
self.columns[column].widget.set_visible(visible); self.columns[column].widget.set_visible(visible);
} }
column++;
} }
columnMgr.setColumnVisibilitySet(visibility); columnMgr.setColumnVisibilitySet(visibility);
self.selectPopup.toggle(); self.selectPopup.toggle();
@ -1164,6 +1167,11 @@ var et2_nextmatch_customfields = et2_customfields_list.extend(et2_INextmatchHead
} }
} }
if(!nm_column) return; if(!nm_column) return;
// Check for global setting changes (visibility)
var global_data = this.getArrayMgr("modifications").getRoot().getEntry('~custom_fields~');
if(global_data.fields) this.options.fields = global_data.fields;
var apps = egw.link_app_list(); var apps = egw.link_app_list();
for(var field_name in this.options.customfields) for(var field_name in this.options.customfields)
{ {