Adapt detection for missing 'All' category option to array of options style

This commit is contained in:
Nathan Gray 2015-04-01 20:17:53 +00:00
parent df515ab7e8
commit db74398622

View File

@ -2394,10 +2394,9 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
} }
// Legacy: Add in 'All' option for cat_id, if not provided. // Legacy: Add in 'All' option for cat_id, if not provided.
if(name == 'cat_id' && options != null && typeof options[''] == 'undefined' && typeof options[0] == 'undefined') if(name == 'cat_id' && options != null && (typeof options[''] == 'undefined' || options[0].value != ''))
{ {
widget_options.empty_label = this.egw().lang('All'); 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.');
} }
// Create widget // Create widget