mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-25 20:31:31 +02:00
* Calendar: fix editing recurring events of type RDATE/explicit dates
changing time and giving error "duration longer than interval", and now also displaying the explicit times
This commit is contained in:
parent
1725406d9a
commit
c93b8b4203
@ -1028,7 +1028,7 @@ class calendar_bo
|
|||||||
// same with the recur exceptions and rdates
|
// same with the recur exceptions and rdates
|
||||||
foreach(['recur_exception', 'recur_rdates'] as $name)
|
foreach(['recur_exception', 'recur_rdates'] as $name)
|
||||||
{
|
{
|
||||||
if (is_array($event[$name] ?? null)) continue;
|
if (!is_array($event[$name] ?? null)) continue;
|
||||||
foreach($event[$name] as &$date)
|
foreach($event[$name] as &$date)
|
||||||
{
|
{
|
||||||
if ($event['whole_day'] && $date_format != 'server')
|
if ($event['whole_day'] && $date_format != 'server')
|
||||||
|
@ -375,6 +375,7 @@ class calendar_rrule implements Iterator
|
|||||||
{
|
{
|
||||||
switch($type)
|
switch($type)
|
||||||
{
|
{
|
||||||
|
default:
|
||||||
case self::DAILY:
|
case self::DAILY:
|
||||||
$duration = 24*3600;
|
$duration = 24*3600;
|
||||||
break;
|
break;
|
||||||
|
@ -247,6 +247,7 @@ exclude weekend calendar de Wochenende ausschließen
|
|||||||
execute a further action for this entry calendar de Führt einen weiteren Befehl für diesen Eintrag aus
|
execute a further action for this entry calendar de Führt einen weiteren Befehl für diesen Eintrag aus
|
||||||
existing links calendar de Bestehende Verknüpfungen
|
existing links calendar de Bestehende Verknüpfungen
|
||||||
exists calendar de Existiert
|
exists calendar de Existiert
|
||||||
|
explicit dates calendar de Explizite Termine
|
||||||
export definition to use for nextmatch export calendar de Export Profil der Listenansicht (Disketten Symbol)
|
export definition to use for nextmatch export calendar de Export Profil der Listenansicht (Disketten Symbol)
|
||||||
exports events from your calendar in ical format. calendar de Exportiert Termine im iCal-Format
|
exports events from your calendar in ical format. calendar de Exportiert Termine im iCal-Format
|
||||||
exports events from your calendar into a csv file. calendar de Exportiert Termine im CSV-Format
|
exports events from your calendar into a csv file. calendar de Exportiert Termine im CSV-Format
|
||||||
|
@ -247,6 +247,7 @@ exclude weekend calendar en Exclude Weekend
|
|||||||
execute a further action for this entry calendar en Execute a further action for this entry
|
execute a further action for this entry calendar en Execute a further action for this entry
|
||||||
existing links calendar en Existing links
|
existing links calendar en Existing links
|
||||||
exists calendar en Exists
|
exists calendar en Exists
|
||||||
|
explicit dates calendar en Explicit dates
|
||||||
export definition to use for nextmatch export calendar en Export definition to use for nextmatch export
|
export definition to use for nextmatch export calendar en Export definition to use for nextmatch export
|
||||||
exports events from your calendar in ical format. calendar en Exports events from your calendar in iCal format.
|
exports events from your calendar in ical format. calendar en Exports events from your calendar in iCal format.
|
||||||
exports events from your calendar into a csv file. calendar en Exports events from your calendar into a CSV file.
|
exports events from your calendar into a csv file. calendar en Exports events from your calendar into a CSV file.
|
||||||
|
@ -120,8 +120,20 @@
|
|||||||
</row>
|
</row>
|
||||||
<row valign="top">
|
<row valign="top">
|
||||||
<et2-description for="recur_data" value="Repeat days"></et2-description>
|
<et2-description for="recur_data" value="Repeat days"></et2-description>
|
||||||
<et2-select-dow statustext="Days of the week for a weekly repeated event" id="recur_data" rows="6"
|
<et2-vbox>
|
||||||
|
<et2-select-dow statustext="Days of the week for a weekly repeated event" id="recur_data" rows="6"
|
||||||
multiple="true" placeholder=""></et2-select-dow>
|
multiple="true" placeholder=""></et2-select-dow>
|
||||||
|
<grid id="recur_rdates" class="recur_rdates">
|
||||||
|
<columns>
|
||||||
|
<column/>
|
||||||
|
</columns>
|
||||||
|
<rows>
|
||||||
|
<row>
|
||||||
|
<et2-date-time id="$row" readonly="true"></et2-date-time>
|
||||||
|
</row>
|
||||||
|
</rows>
|
||||||
|
</grid>
|
||||||
|
</et2-vbox>
|
||||||
<et2-vbox>
|
<et2-vbox>
|
||||||
<et2-description value="Exceptions"></et2-description>
|
<et2-description value="Exceptions"></et2-description>
|
||||||
<et2-button statustext="Create an exception for the given date" label="@exception_label"
|
<et2-button statustext="Create an exception for the given date" label="@exception_label"
|
||||||
|
@ -2044,6 +2044,11 @@ div.calendar {
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
line-height: 30px;
|
line-height: 30px;
|
||||||
}
|
}
|
||||||
|
#calendar-edit #calendar-edit_calendar-edit-recurrence table.recur_rdates tbody {
|
||||||
|
display: table;
|
||||||
|
width: 100%;
|
||||||
|
line-height: normal;
|
||||||
|
}
|
||||||
#calendar-edit #calendar-edit_calendar-edit-custom tbody {
|
#calendar-edit #calendar-edit_calendar-edit-custom tbody {
|
||||||
display: table;
|
display: table;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
@ -2032,6 +2032,11 @@ div.calendar {
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
line-height: 30px;
|
line-height: 30px;
|
||||||
}
|
}
|
||||||
|
#calendar-edit #calendar-edit_calendar-edit-recurrence table.recur_rdates tbody {
|
||||||
|
display: table;
|
||||||
|
width: 100%;
|
||||||
|
line-height: normal;
|
||||||
|
}
|
||||||
#calendar-edit #calendar-edit_calendar-edit-custom tbody {
|
#calendar-edit #calendar-edit_calendar-edit-custom tbody {
|
||||||
display: table;
|
display: table;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
@ -489,6 +489,13 @@ div.calendar { position: relative; }
|
|||||||
line-height: 30px;
|
line-height: 30px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#calendar-edit_calendar-edit-recurrence{
|
||||||
|
table.recur_rdates tbody {
|
||||||
|
display: table;
|
||||||
|
width: 100%;
|
||||||
|
line-height: normal;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*###########################################*/
|
/*###########################################*/
|
||||||
// Benutzerdefiniert
|
// Benutzerdefiniert
|
||||||
|
Loading…
x
Reference in New Issue
Block a user