extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix full day non blocking events could not be dragged

Browse Source
This commit is contained in:
nathan 2023-05-25 13:40:48 -06:00
parent a8a5a14b12
commit 2b61bf0303
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_ui.inc.php
View File

@ -665,7 +665,7 @@ class calendar_ui
$this->cal_prefs['saved_states']['cat_id'])) $this->cal_prefs['saved_states']['cat_id']))
{ {
$filter_check = array( $filter_check = array(
'start' => $event['start'], 'start' => $event['start'] - 1,
'users' => $this->cal_prefs['saved_states']['owner'], 'users' => $this->cal_prefs['saved_states']['owner'],
'cat_id' => $this->cal_prefs['saved_states']['cat_id'], 'cat_id' => $this->cal_prefs['saved_states']['cat_id'],
'filter' => $this->cal_prefs['saved_states']['status_filter'], 'filter' => $this->cal_prefs['saved_states']['status_filter'],

4
calendar/js/app.ts
View File

@ -968,6 +968,7 @@ export class CalendarApp extends EgwApp
handle: state.view == 'day' ? '.calendar_calToday' : '.calendar_calGridHeader', handle: state.view == 'day' ? '.calendar_calToday' : '.calendar_calGridHeader',
animation: 100, animation: 100,
filter: state.view == 'day' ? '.calendar_calTimeGridScroll' : '.calendar_calDayColHeader', filter: state.view == 'day' ? '.calendar_calTimeGridScroll' : '.calendar_calDayColHeader',
preventOnFilter: false, // Required for dnd fullday nonblocking
dataIdAttr: 'data-owner', dataIdAttr: 'data-owner',
direction: state.view == 'day' ? 'horizental' : 'vertical', direction: state.view == 'day' ? 'horizental' : 'vertical',
sort: state.owner.length > 1 && ( sort: state.owner.length > 1 && (
@ -976,7 +977,8 @@ export class CalendarApp extends EgwApp
onStart: function(event) onStart: function(event)
{ {
// Put owners into row IDs // Put owners into row IDs
CalendarApp.views[app.calendar.state.view].etemplates[0].widgetContainer.iterateOver(function(widget) { CalendarApp.views[app.calendar.state.view].etemplates[0].widgetContainer.iterateOver(function(widget)
{
if(widget.options.owner && !widget.disabled) if(widget.options.owner && !widget.disabled)
{ {
widget.div.parents('tr').attr('data-owner', widget.options.owner); widget.div.parents('tr').attr('data-owner', widget.options.owner);

4
calendar/js/et2_widget_timegrid.ts
View File

@ -243,8 +243,8 @@ export class et2_calendar_timegrid extends et2_calendar_view implements et2_IDet
} }
// Load the event // Load the event
timegrid._get_event_info(this); const event_info = timegrid._get_event_info(this);
if(this.classList.contains("resizing")) if(this.classList.contains("resizing") || event_info.whole_day === "true")
{ {
// Currently already resizing // Currently already resizing
return; return;