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

Fix some months not showing enough weeks

Browse Source
This commit is contained in:
Nathan Gray 2016-01-19 15:37:15 +00:00
parent c84972f905
commit 2a91237c2a
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
calendar/js/app.js
View File

@ -1293,24 +1293,27 @@ app.classes.calendar = AppJS.extend(
extra = extra.replace(/(\$|%24)app/,id[0]).replace(/(\$|%24)id/,id[1]); extra = extra.replace(/(\$|%24)app/,id[0]).replace(/(\$|%24)id/,id[1]);
// Get a little smarter with the context // Get a little smarter with the context
var context = {} if(!extra)
if(egw.dataGetUIDdata(_events[0].id) && egw.dataGetUIDdata(_events[0].id).data)
{ {
// Found data in global cache var context = {}
context = egw.dataGetUIDdata(_events[0].id).data; if(egw.dataGetUIDdata(_events[0].id) && egw.dataGetUIDdata(_events[0].id).data)
extra = {}; {
// Found data in global cache
context = egw.dataGetUIDdata(_events[0].id).data;
extra = {};
}
else if (_events[0].iface.getWidget() && _events[0].iface.getWidget().instanceOf(et2_valueWidget))
{
// Able to extract something from the widget
context = _events[0].iface.getWidget().getValue ?
_events[0].iface.getWidget().getValue() :
_events[0].iface.getWidget().options.value || {}
extra = {};
}
if(context.date) extra.date = context.date;
if(context.app) extra.app = context.app;
if(context.app_id) extra.app_id = context.app_id;
} }
else if (_events[0].iface.getWidget() && _events[0].iface.getWidget().instanceOf(et2_valueWidget))
{
// Able to extract something from the widget
context = _events[0].iface.getWidget().getValue ?
_events[0].iface.getWidget().getValue() :
_events[0].iface.getWidget().options.value || {}
extra = {};
}
if(context.date) extra.date = context.date;
if(context.app) extra.app = context.app;
if(context.app_id) extra.app_id = context.app_id;
this.egw.open(open.id_data||'',open.app,open.type,extra ? extra : context); this.egw.open(open.id_data||'',open.app,open.type,extra ? extra : context);
} }
@ -3559,10 +3562,10 @@ jQuery.extend(app.classes.calendar,{
}, },
end_date: function(state) { end_date: function(state) {
var d = app.calendar.View.end_date.call(this,state); var d = app.calendar.View.end_date.call(this,state);
d = new Date(d.getFullYear(),d.getUTCMonth() + 1, 0); d = new Date(d.getFullYear(),d.getUTCMonth() + 1, 0,0,0,0);
var week_start = app.calendar.date.start_of_week(d); var week_start = app.calendar.date.start_of_week(d);
if(week_start < d) week_start.setUTCHours(24*7); if(week_start < d) week_start.setUTCHours(24*7);
week_start.setUTCHours(week_start.getUTCHours()-1); week_start.setUTCSeconds(week_start.getUTCSeconds()-1);
return week_start; return week_start;
}, },
granularity: function(state) { granularity: function(state) {