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

fixed wrong warning "event was edited by other user" after storing an event more then once, was caused always splitting series, but not checking that condition

Browse Source
This commit is contained in:
Ralf Becker 2014-01-30 10:12:08 +00:00
parent e70a7bcf07
commit 6b4bc0547c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -475,7 +475,7 @@ class calendar_uiforms extends calendar_ui
$button = $event['button_was']; // save or apply
unset($event['button_was']);
break;
}
switch((string)$button)
@ -777,6 +777,9 @@ class calendar_uiforms extends calendar_ui
}
elseif ($conflicts > 0)
{
// series moved by splitting in two --> move alarms and exceptions
if ($old_event && $old_event['id'] != $event['id'])
{
foreach ((array)$old_alarms as $alarm)
{
// check if alarms still needed in old event, if not delete it
@ -827,7 +830,7 @@ class calendar_uiforms extends calendar_ui
$this->bo->update($exception, true, true, true, true, $msg=null, $content['no_notifications']);
}
}
}
$message = lang('Event saved');
if ($status_reset_to_unknown)
@ -1818,7 +1821,7 @@ class calendar_uiforms extends calendar_ui
}
}
}
}
}
$etpl->exec('calendar.calendar_uiforms.process_edit',$content,array(),$readonlys,array_merge($event,$preserv),$preserv['no_popup'] ? 0 : 2);