extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 01:48:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing conflict dialog if you drag a full day non-blocking event to a time changing it to full day blocking, and there's a conflict with en existing event that day.

Browse Source
This commit is contained in:
Nathan Gray 2015-11-12 18:54:20 +00:00
parent 948bf94f67
commit 83390eca97
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2653,6 +2653,10 @@ class calendar_uiforms extends calendar_ui
{ {
$event['whole_day'] = ($duration == DAY_s); $event['whole_day'] = ($duration == DAY_s);
$event['non_blocking'] = false; $event['non_blocking'] = false;
// If there's a conflict, it won't save the change and the conflict popup will be blank
// so save the change now, and then let the conflict check happen.
$this->bo->update($event,true, true, false, true, $message,true);
// Whole day non blocking with DAY_s would add a day // Whole day non blocking with DAY_s would add a day
if($duration==DAY_s) $duration=0; if($duration==DAY_s) $duration=0;
} }

2
calendar/js/et2_widget_event.js
View File

@ -144,6 +144,8 @@ var et2_calendar_event = et2_valueWidget.extend([et2_IDetachedDOM],
old_daywise.splice(old_daywise.indexOf(this.options.value.id),1); old_daywise.splice(old_daywise.indexOf(this.options.value.id),1);
egw.dataStoreUID(old_cache_id,old_daywise); egw.dataStoreUID(old_cache_id,old_daywise);
egw.dataStoreUID(new_cache_id,new_daywise); egw.dataStoreUID(new_cache_id,new_daywise);
this._parent.removeChild(this);
} }
// Copy to avoid changes, which may cause nm problems // Copy to avoid changes, which may cause nm problems