mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-22 16:03:47 +01:00
Fix changes via popup edit are not shown in main (week, etc) views
This commit is contained in:
parent
62eb8e00f2
commit
069da4dace
@ -696,14 +696,14 @@ class calendar_ui
|
||||
if(!$event)
|
||||
{
|
||||
// Sending null will trigger a removal
|
||||
$response->call('egw.dataStoreUID','calendar::'.$event_id,null);
|
||||
$response->generic('data', array('uid' => 'calendar::'.$event['row_id'], 'data' => null));
|
||||
return false;
|
||||
}
|
||||
|
||||
if(!$event['recur_type'] || $recurrence_date)
|
||||
{
|
||||
$this->to_client($event);
|
||||
$response->call('egw.dataStoreUID','calendar::'.$event['row_id'],$event);
|
||||
$response->generic('data', array('uid' => 'calendar::'.$event['row_id'], 'data' => $event));
|
||||
}
|
||||
// If it's recurring, try to send the next month or so
|
||||
else if($event['recur_type'] )
|
||||
@ -716,7 +716,7 @@ class calendar_ui
|
||||
$occurrence = $rrule->current();
|
||||
$converted = $this->bo->read($event['id'], $occurrence);
|
||||
$this->to_client($converted);
|
||||
$response->call('egw.dataStoreUID','calendar::'.$converted['row_id'],$converted);
|
||||
$response->generic('data', array('uid' => 'calendar::'.$converted['row_id'], 'data' => $converted));
|
||||
$rrule->next();
|
||||
}
|
||||
while ($rrule->valid() && $occurrence <= $this_month );
|
||||
|
@ -793,6 +793,12 @@ class calendar_uiforms extends calendar_ui
|
||||
}
|
||||
}
|
||||
}
|
||||
// Adding participants needs to be done as an edit, in case we
|
||||
// have participants visible in seperate calendars
|
||||
if(count(array_diff_key($event['participants'], $old_event['participants'])))
|
||||
{
|
||||
$update_type = 'edit';
|
||||
}
|
||||
$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
|
||||
unset($event['ignore']);
|
||||
}
|
||||
|
@ -348,6 +348,9 @@ var et2_calendar_event = et2_valueWidget.extend([et2_IDetachedDOM],
|
||||
}
|
||||
}
|
||||
|
||||
// Clear tooltip for regeneration
|
||||
this.set_statustext('');
|
||||
|
||||
// Height specific section
|
||||
this._small_size();
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user