extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 08:23:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better use supplied context when adding

Browse Source
This commit is contained in:
Nathan Gray 2016-01-18 22:48:38 +00:00
parent 0726de19fc
commit a79e017ea9
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
calendar/js/app.js
View File

@ -1291,7 +1291,28 @@ app.classes.calendar = AppJS.extend(
var extra = open.extra || ''; var extra = open.extra || '';
extra = extra.replace(/(\$|%24)app/,id[0]).replace(/(\$|%24)id/,id[1]); extra = extra.replace(/(\$|%24)app/,id[0]).replace(/(\$|%24)id/,id[1]);
this.egw.open(open.id_data||'',open.app,open.type,extra);
// Get a little smarter with the context
var context = {}
if(egw.dataGetUIDdata(_events[0].id) && egw.dataGetUIDdata(_events[0].id).data)
{
// 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;
this.egw.open(open.id_data||'',open.app,open.type,extra ? extra : context);
} }
else if (_action.data.url) else if (_action.data.url)
{ {