extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-24 11:51:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix context menu Calendar -> Add appointment

Browse Source
This commit is contained in:
Nathan Gray 2014-01-14 15:43:06 +00:00
parent 1834389fec
commit b5ca559968
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addressbook/js/app.js
View File

@ -86,24 +86,27 @@ app.classes.addressbook = AppJS.extend(
*/ */
add_cal: function(_action, _senders) add_cal: function(_action, _senders)
{ {
if (!_senders[0].id.match(/^[0-9]+$/)) if (!_senders[0].id.match(/^(?:addressbook::)?[0-9]+$/))
{ {
// send org-view requests to server // send org-view requests to server
_action.data.nm_action = "submit"; _action.data.nm_action = "submit";
nm_action(_action, _senders);
} }
else else
{ {
// call nm_action's popup, but already replace id's in url, because they need to be prefix with a "c"
if (_action.data.popup) _action.data.nm_action = "popup";
var ids = ""; var ids = "";
for (var i = 0; i < _senders.length; i++) for (var i = 0; i < _senders.length; i++)
{ {
ids += "c" + _senders[i].id + ((i < _senders.length - 1) ? "," : ""); // Remove UID prefix for just contact_id
var id = _senders[i].id.split('::');
ids += "c" + id[1] + ((i < _senders.length - 1) ? "," : "");
} }
// we cant just replace $id, as under jdots this can get called multiple times (with already replaced url)! var extra = {};
_action.data.url = _action.data.url.replace(/(owner|participants)=(0%2C)?[^&]+/,"$1=$2"+ids); extra[_action.data.url.indexOf('owner') > 0 ? 'owner' : 'participants'] = ids;
// Use framework to add calendar entry
egw.open('','calendar','add',extra);
} }
nm_action(_action, _senders);
}, },
/** /**