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

Fix clicking inside a single other user's calendar did not invite that user when new event preference was 'Just me'

Browse Source
This commit is contained in:
nathangray 2016-09-27 10:21:25 -06:00
parent d1927a1dcf
commit 0b6e3fc1ae
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -77,7 +77,9 @@ class calendar_uiforms extends calendar_ui
*/
function &default_add_event()
{
$extra_participants = $_GET['participants'] ? explode(',',$_GET['participants']) : array();
$extra_participants = $_GET['participants'] ?
(!is_array($_GET['participants']) ? explode(',',$_GET['participants']) : $_GET['participants']) :
array();
// if participant is a contact, add its link title as title
foreach($extra_participants as $uid)
@ -98,7 +100,7 @@ class calendar_uiforms extends calendar_ui
}
if(is_array($owner))
{
if($this->cal_prefs['default_participant'])
if($this->cal_prefs['default_participant'] || count($participants) === 0 && count($owner) === 1)
{
$extra_participants += $owner;
}

4
calendar/js/et2_widget_daycol.js
View File

@ -1077,7 +1077,7 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
hour: _ev.target.dataset.hour || this._parent.options.day_start,
minute: _ev.target.dataset.minute || 0
};
if (this.options.owner != app.calendar.state.owner)
if (this.options.owner.toString() !== app.calendar.state.owner.toString())
{
options.owner = this.options.owner;
}
@ -1096,7 +1096,7 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
end: end,
non_blocking: true
}
if (this.options.owner != app.calendar.state.owner)
if (this.options.owner.toString() !== app.calendar.state.owner.toString())
{
options.owner = this.options.owner;
}

2
calendar/js/et2_widget_timegrid.js
View File

@ -1863,7 +1863,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
hour: target.dataset.hour || this._parent.options.day_start,
minute: target.dataset.minute || 0
};
if (this.options.owner != app.calendar.state.owner)
if (this.options.owner.toString() !== app.calendar.state.owner.toString())
{
options.owner = this.options.owner;
}