extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow setting alarms on recurring events beginning in the past

Browse Source
This commit is contained in:
Nathan Gray 2014-12-09 22:35:36 +00:00
parent dba4a12f0a
commit bd6af0b94b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -938,14 +938,13 @@ class calendar_uiforms extends calendar_ui
break; break;
case 'add_alarm': case 'add_alarm':
$time = ($content['actual_date'] ? $content['actual_date'] : $content['start']); $time = $content['start'];
$offset = $time - $content['new_alarm']['date']; $offset = $time - $content['new_alarm']['date'];
if ($event['recur_type'] != MCAL_RECUR_NONE && if ($event['recur_type'] != MCAL_RECUR_NONE &&
($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + $offset, true)) && ($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + $offset, true)) &&
$time < $next_occurrence['start']) $time < $next_occurrence['start'])
{ {
$time = $next_occurrence['start']; $content['new_alarm']['date'] = $next_occurrence['start'] - $offset;
} }
if ($this->bo->check_perms(EGW_ACL_EDIT,!$content['new_alarm']['owner'] ? $event : 0,$content['new_alarm']['owner'])) if ($this->bo->check_perms(EGW_ACL_EDIT,!$content['new_alarm']['owner'] ? $event : 0,$content['new_alarm']['owner']))
{ {