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

Refine cache check conditions, rows is always empty by this point.

Browse Source 
r48042: Make sure options are there before looking inside, avoids a potential error in filter options
r48106: - Adjust default columns to exclude resolution, completion, timesheets, votes and bounties.  They can still be turned on manually, just hidden by default.
- Set some more default column widths
This commit is contained in:
Ralf Becker 2014-08-22 12:31:15 +00:00
parent 75cd8d2c39
commit 7db4672b35
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etemplate/js/et2_extension_nextmatch.js
View File

@ -686,6 +686,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
if(this.options.settings.selectcols)
{
columnPreference = this.options.settings.selectcols;
negated = false;
}
if(!this.options.settings.columnselection_pref)
{
@ -1531,7 +1532,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
// If no data was sent from the server, and num_rows is 0, the nm will be empty.
// This triggers a cache check.
if(!(this.options.settings.rows && this.options.settings.num_rows))
if(!this.options.settings.num_rows)
{
this.controller.update();
}
@ -2099,7 +2100,7 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
}
// Legacy: Add in 'All' option for cat_id, if not provided.
if(name == 'cat_id' && typeof options[''] == 'undefined' && typeof options[0] == 'undefined')
if(name == 'cat_id' && options != null && typeof options[''] == 'undefined' && typeof options[0] == 'undefined')
{
widget_options.empty_label = this.egw().lang('All');
this.egw().debug('warn', 'Nextmatch category filter had no "All" option. Added, but you should fix that.');