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

Always pass owner when creating a new appointment, server will check preference and decide who to add as participants. Fixes one more case where 'Just me' preference was not correctly handled - single week, single other user.

Browse Source
This commit is contained in:
nathangray 2016-10-04 09:43:52 -06:00
parent b7d02b3229
commit 339241cce7
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
calendar/js/et2_widget_daycol.js
View File

@ -1075,12 +1075,9 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
var options = { var options = {
date: _ev.target.dataset.date || this.options.date, date: _ev.target.dataset.date || this.options.date,
hour: _ev.target.dataset.hour || this._parent.options.day_start, hour: _ev.target.dataset.hour || this._parent.options.day_start,
minute: _ev.target.dataset.minute || 0 minute: _ev.target.dataset.minute || 0,
owner: this.options.owner
}; };
if (this.options.owner.toString() !== app.calendar.state.owner.toString())
{
options.owner = this.options.owner;
}
this.egw().open(null, 'calendar', 'add', options, '_blank'); this.egw().open(null, 'calendar', 'add', options, '_blank');
return false; return false;
} }
@ -1094,11 +1091,8 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
var options = { var options = {
start: this.date.toJSON(), start: this.date.toJSON(),
end: end, end: end,
non_blocking: true non_blocking: true,
} owner: this.options.owner
if (this.options.owner.toString() !== app.calendar.state.owner.toString())
{
options.owner = this.options.owner;
} }
this.egw().open(null, 'calendar', 'add', options, '_blank'); this.egw().open(null, 'calendar', 'add', options, '_blank');
return false; return false;