R55852 - in /trunk/calendar/js: et2_widget_event.js et2_widget_planner.js

[ralfbecker_sf]

Author: ralfbecker
New Revision: 55852

URL: http://svn.stylite.de/viewvc/egroupware?rev=55852&view=rev
Log:
fix wrong/old url to load categories, now /api/categories.php

Modified:
trunk/calendar/js/et2_widget_event.js
trunk/calendar/js/et2_widget_planner.js

Modified: trunk/calendar/js/et2_widget_event.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/js/et2_widget_event.js?rev=55852&r1=55851&r2=55852&view=diff

— trunk/calendar/js/et2_widget_event.js (original)
+++ trunk/calendar/js/et2_widget_event.js Tue Apr 26 16:35:58 2016
@@ -260,7 +260,7 @@
}, {application:event.app||‘calendar’});

	// 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)
    if(!this.div.has(this.title).length)
  

@@ -888,17 +888,17 @@
// Static class stuff
/**

• Check event owner against a parent object

• • 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
  • 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
  • displayed or included.

• • @param {Object} event - Event information
  • @param {et2_widget_daycol|et2_widget_planner_row} parent - potential parent object
  • that has an owner option

• • @return {boolean} Should the event be displayed
    */
    et2_calendar_event.owner_check = function owner_check(event, parent)

Modified: trunk/calendar/js/et2_widget_planner.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/js/et2_widget_planner.js?rev=55852&r1=55851&r2=55852&view=diff

— trunk/calendar/js/et2_widget_planner.js (original)
+++ trunk/calendar/js/et2_widget_planner.js Tue Apr 26 16:35:58 2016
@@ -357,7 +357,7 @@
}
}
}

•   		return labels.sort(function(a,b) {
    			return a.label.localeCompare(b.label);
    		});
  

@@ -801,7 +801,7 @@
for(var key in labels)
{
if (!labels.hasOwnProperty(key)) continue;

•   	// Skip sub-categories (events are merged into top level)
    	if(this.options.group_by == 'category' &&
    		(!app.calendar.state.cat_id || app.calendar.state.cat_id == '') &&
  

@@ -1546,7 +1546,7 @@
}, {application:event.data.app||‘calendar’});

						// 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 @@
}
}
},

• /**
  • Call change handler, if set

---

Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z

---

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs