et2_extension_nextmatch.js

nathangray 2016-04-25 14:49:59 UTC #1

Author: nathangray
New Revision: 55829

URL: http://svn.stylite.de/viewvc/egroupware?rev=55829&view=rev
Log:

For print column dialog don’t check individual customfields if no customfields are selected
Fix afterPrint failing if columnselection preference had no nextmatch prefix

Modified:
trunk/egroupware/api/js/etemplate/et2_extension_nextmatch.js

Modified: trunk/egroupware/api/js/etemplate/et2_extension_nextmatch.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/js/etemplate/et2_extension_nextmatch.js?rev=55829&r1=55828&r2=55829&view=diff

— trunk/egroupware/api/js/etemplate/et2_extension_nextmatch.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_extension_nextmatch.js Mon Apr 25 16:49:59 2016
@@ -2061,7 +2061,10 @@
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.push(et2_customfields_list.prototype.prefix+field_name);

  			if(widget.options.fields[field_name] && columns_selected.indexOf(colName) >= 0)

```
  			{
```

  				columns_selected.push(et2_customfields_list.prototype.prefix+field_name);

```
  			}
  		}
  	}
  }
```

@@ -2228,7 +2231,21 @@
}

	// Restore columns

  this.set_columns(this.egw().preference(this.options.settings.columnselection_pref,this.getInstanceManager().app));

```
  var pref = [];
```

  var app = this.getInstanceManager().app;

  if(this.options.settings.columnselection_pref.indexOf('nextmatch') == 0)

```
  {
```

  	pref = egw.preference(this.options.settings.columnselection_pref, app);

```
  }
```
```
  else
```
```
  {
```

  	// 'nextmatch-' prefix is there in preference name, but not in setting, so add it in

  	pref = egw.preference("nextmatch-"+this.options.settings.columnselection_pref, app);

```
  }
```
```
  if(pref)
```
```
  {
```
```
  	this.set_columns(pref,app);
```

  }
  this.dynheight.outerNode.css('max-width','inherit');
  this.resize();

}

Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs