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

More fixing on the category filter, this time to make it work again

Browse Source
This commit is contained in:
Nathan Gray 2015-11-23 17:36:21 +00:00
parent 88a9bd6583
commit f87c905777
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
calendar/js/app.js
View File

@ -2303,6 +2303,13 @@ app.classes.calendar = AppJS.extend(
start = 0; start = 0;
} }
// Category needs to be false if empty, not an empty array or string
var cat_id = state.cat_id ? state.cat_id : false;
if(cat_id && typeof cat_id.join != 'undefined')
{
if(cat_id.join('') == '') cat_id = false;
}
var query = jQuery.extend({}, { var query = jQuery.extend({}, {
get_rows: 'calendar.calendar_uilist.get_rows', get_rows: 'calendar.calendar_uilist.get_rows',
row_id:'row_id', row_id:'row_id',
@ -2312,7 +2319,7 @@ app.classes.calendar = AppJS.extend(
col_filter: {participant: (typeof state.owner == 'string' || typeof state.owner == 'number' ? [state.owner] : state.owner)}, col_filter: {participant: (typeof state.owner == 'string' || typeof state.owner == 'number' ? [state.owner] : state.owner)},
filter:'custom', // Must be custom to get start & end dates filter:'custom', // Must be custom to get start & end dates
status_filter: state.filter, status_filter: state.filter,
cat_id: state.cat_id && typeof state.cat_id.join != "undefined" && state.cat_id.join('') != '' ? state.cat_id : false, cat_id: cat_id,
search: state.keywords, search: state.keywords,
csv_export: false csv_export: false
}); });