extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-18 11:58:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix wrong/old url to load categories, now /api/categories.php

Browse Source
This commit is contained in:
Ralf Becker 2016-04-26 14:35:58 +00:00
parent b9bfdb06c8
commit 7cb470d904
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/js/et2_widget_event.js
View File

@ -260,7 +260,7 @@ var et2_calendar_event = (function(){ "use strict"; return et2_valueWidget.exten
}, {application:event.app||'calendar'}); }, {application:event.app||'calendar'});
// Get CSS too // Get CSS too
egw.includeCSS('/phpgwapi/categories.php?app='+event.app); egw.includeCSS('/api/categories.php?app='+event.app);
// Need cleaning? (DnD helper removes content) // Need cleaning? (DnD helper removes content)
if(!this.div.has(this.title).length) if(!this.div.has(this.title).length)
@ -888,17 +888,17 @@ et2_register_widget(et2_calendar_event, ["calendar-event"]);
// Static class stuff // Static class stuff
/** /**
* Check event owner against a parent object * Check event owner against a parent object
* *
* As an event is edited, its participants may change. Also, as the state * As an event is edited, its participants may change. Also, as the state
* changes we may change which events are displayed and show the same event * changes we may change which events are displayed and show the same event
* in several places for different users. Here we check the event participants * in several places for different users. Here we check the event participants
* against an owner value (which may be an array) to see if the event should be * against an owner value (which may be an array) to see if the event should be
* displayed or included. * displayed or included.
* *
* @param {Object} event - Event information * @param {Object} event - Event information
* @param {et2_widget_daycol|et2_widget_planner_row} parent - potential parent object * @param {et2_widget_daycol|et2_widget_planner_row} parent - potential parent object
* that has an owner option * that has an owner option
* *
* @return {boolean} Should the event be displayed * @return {boolean} Should the event be displayed
*/ */
et2_calendar_event.owner_check = function owner_check(event, parent) et2_calendar_event.owner_check = function owner_check(event, parent)

8
calendar/js/et2_widget_planner.js
View File

@ -357,7 +357,7 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
} }
} }
} }
return labels.sort(function(a,b) { return labels.sort(function(a,b) {
return a.label.localeCompare(b.label); return a.label.localeCompare(b.label);
}); });
@ -801,7 +801,7 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
for(var key in labels) for(var key in labels)
{ {
if (!labels.hasOwnProperty(key)) continue; if (!labels.hasOwnProperty(key)) continue;
// Skip sub-categories (events are merged into top level) // Skip sub-categories (events are merged into top level)
if(this.options.group_by == 'category' && if(this.options.group_by == 'category' &&
(!app.calendar.state.cat_id || app.calendar.state.cat_id == '') && (!app.calendar.state.cat_id || app.calendar.state.cat_id == '') &&
@ -1546,7 +1546,7 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
}, {application:event.data.app||'calendar'}); }, {application:event.data.app||'calendar'});
// Get CSS too // Get CSS too
egw.includeCSS('/phpgwapi/categories.php?app='+event.data.app); egw.includeCSS('/api/categories.php?app='+event.data.app);
} }
} }
@ -1663,7 +1663,7 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
} }
} }
}, },
/** /**
* Call change handler, if set * Call change handler, if set
* *