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

Fix calendar favorites gets failed when encounters cat_ids in string format

Browse Source
This commit is contained in:
Hadi Nategh 2016-09-08 12:23:41 +02:00
parent ea30baf1a3
commit 12fbe113cf
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/js/app.js
View File

@ -1042,7 +1042,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
/** /**
* Actions for when the user changes the event start date in edit dialog * Actions for when the user changes the event start date in edit dialog
* *
* @returns {undefined} * @returns {undefined}
*/ */
edit_start_change: function(input, widget) edit_start_change: function(input, widget)
@ -1051,7 +1051,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
{ {
widget = etemplate2.getById('calendar-edit').widgetContainer.getWidgetById('start'); widget = etemplate2.getById('calendar-edit').widgetContainer.getWidgetById('start');
} }
// Update settings for querying participants // Update settings for querying participants
this.edit_update_participant(widget); this.edit_update_participant(widget);
@ -2838,6 +2838,8 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
{ {
if(cat_id.join('') == '') cat_id = false; if(cat_id.join('') == '') cat_id = false;
} }
// Make sure cat_id reaches to server in array format
if (cat_id && typeof cat_id == 'string') cat_id = cat_id.split(',');
var query = jQuery.extend({}, { var query = jQuery.extend({}, {
get_rows: 'calendar.calendar_uilist.get_rows', get_rows: 'calendar.calendar_uilist.get_rows',