Skip to content
Snippets Groups Projects
Commit 32034295 authored by Owen Bush's avatar Owen Bush Committed by Owen Bush
Browse files

Issue #3238591 by owenbush, hotsaucedesign: Unable to save changed "Recur on... 

Issue #3238591 by owenbush, hotsaucedesign: Unable to save changed "Recur on Day of the Week" in Event Series
parent d866128c
No related branches found
Tags 8.x-1.6
No related merge requests found
Hide whitespace changes
Inline Side-by-side
recurring_events.views.inc
+ 1
− 1
View file @ 32034295
......@@ -61,7 +61,7 @@ function recurring_events_views_data_alter(array &$data) {
$data[$table_name][$field_name]['argument']['id'] = 'datetime';
$data[$table_name][$field_name]['argument']['field_name'] = 'date';
$group = $data[$table_name][$field_name]['group'];
$group = $data[$table_name][$field_name]['group'] ?? '';
foreach ($arguments as $argument_type => $help_text) {
$data[$table_name][$field_name . '_' . $argument_type] = [
......
src/Plugin/Field/FieldType/ConsecutiveRecurringDate.php
+ 18
− 18
View file @ 32034295
......@@ -187,46 +187,46 @@ class ConsecutiveRecurringDate extends DateRangeItem implements RecurringEventsF
'override' => $form_config['end_date']->format(DateTimeItemInterface::DATE_STORAGE_FORMAT),
];
}
if ($entity_config['time'] !== $form_config['time']) {
if (($entity_config['time'] ?? '') !== ($form_config['time'] ?? '')) {
$diff['time'] = [
'label' => t('Time'),
'stored' => $entity_config['time'],
'override' => $form_config['time'],
'stored' => $entity_config['time'] ?? '',
'override' => $form_config['time'] ?? '',
];
}
if ($entity_config['end_time'] !== $form_config['end_time']) {
if (($entity_config['end_time'] ?? '') !== ($form_config['end_time'] ?? '')) {
$diff['end_time'] = [
'label' => t('End Time'),
'stored' => $entity_config['end_time'],
'override' => $form_config['end_time'],
'stored' => $entity_config['end_time'] ?? '',
'override' => $form_config['end_time'] ?? '',
];
}
if ($entity_config['duration'] !== $form_config['duration']) {
if (($entity_config['duration'] ?? '') !== ($form_config['duration'] ?? '')) {
$diff['duration'] = [
'label' => t('Duration'),
'stored' => $entity_config['duration'],
'override' => $form_config['duration'],
'stored' => $entity_config['duration'] ?? '',
'override' => $form_config['duration'] ?? '',
];
}
if ($entity_config['duration_units'] !== $form_config['duration_units']) {
if (($entity_config['duration_units'] ?? '') !== ($form_config['duration_units'] ?? '')) {
$diff['duration_units'] = [
'label' => t('Duration Units'),
'stored' => $entity_config['duration_units'],
'override' => $form_config['duration_units'],
'stored' => $entity_config['duration_units'] ?? '',
'override' => $form_config['duration_units'] ?? '',
];
}
if ($entity_config['buffer'] !== $form_config['buffer']) {
if (($entity_config['buffer'] ?? '') !== ($form_config['buffer'] ?? '')) {
$diff['buffer'] = [
'label' => t('Buffer'),
'stored' => $entity_config['buffer'],
'override' => $form_config['buffer'],
'stored' => $entity_config['buffer'] ?? '',
'override' => $form_config['buffer'] ?? '',
];
}
if ($entity_config['buffer_units'] !== $form_config['buffer_units']) {
if (($entity_config['buffer_units'] ?? '') !== ($form_config['buffer_units'] ?? '')) {
$diff['buffer_units'] = [
'label' => t('Buffer Units'),
'stored' => $entity_config['buffer_units'],
'override' => $form_config['buffer_units'],
'stored' => $entity_config['buffer_units'] ?? '',
'override' => $form_config['buffer_units'] ?? '',
];
}
......
src/Plugin/Field/FieldType/DailyRecurringDate.php
+ 6
− 6
View file @ 32034295
......@@ -134,18 +134,18 @@ class DailyRecurringDate extends DateRangeItem implements RecurringEventsFieldTy
'override' => $form_config['end_date']->format(DateTimeItemInterface::DATE_STORAGE_FORMAT),
];
}
if ($entity_config['time'] !== $form_config['time']) {
if (($entity_config['time'] ?? '') !== ($form_config['time'] ?? '')) {
$diff['time'] = [
'label' => t('Time'),
'stored' => $entity_config['time'],
'override' => $form_config['time'],
'stored' => $entity_config['time'] ?? '',
'override' => $form_config['time'] ?? '',
];
}
if ($entity_config['duration'] !== $form_config['duration']) {
if (($entity_config['duration'] ?? '') !== ($form_config['duration'] ?? '')) {
$diff['duration'] = [
'label' => t('Duration'),
'stored' => $entity_config['duration'],
'override' => $form_config['duration'],
'stored' => $entity_config['duration'] ?? '',
'override' => $form_config['duration'] ?? '',
];
}
......
src/Plugin/Field/FieldType/MonthlyRecurringDate.php
+ 13
− 13
View file @ 32034295
......@@ -157,36 +157,36 @@ class MonthlyRecurringDate extends WeeklyRecurringDate implements RecurringEvent
public static function buildDiffArray(array $entity_config, array $form_config) {
$diff = parent::buildDiffArray($entity_config, $form_config);
if ($entity_config['type'] === 'monthly') {
if ($entity_config['monthly_type'] !== $form_config['monthly_type']) {
if ($entity_config['type'] === 'monthly_recurring_date') {
if (($entity_config['monthly_type'] ?? '') !== ($form_config['monthly_type'] ?? '')) {
$diff['monthly_type'] = [
'label' => t('Monthly Type'),
'stored' => $entity_config['monthly_type'],
'override' => $form_config['monthly_type'],
'stored' => $entity_config['monthly_type'] ?? '',
'override' => $form_config['monthly_type'] ?? '',
];
}
if ($entity_config['monthly_type'] === 'weekday') {
if ($entity_config['day_occurrence'] !== $form_config['day_occurrence']) {
if (($entity_config['day_occurrence'] ?? []) !== ($form_config['day_occurrence'] ?? [])) {
$diff['day_occurrence'] = [
'label' => t('Day Occurrence'),
'stored' => implode(',', $entity_config['day_occurrence']),
'override' => implode(',', $form_config['day_occurrence']),
'stored' => implode(',', ($entity_config['day_occurrence'] ?? [])),
'override' => implode(',', ($form_config['day_occurrence'] ?? [])),
];
}
if ($entity_config['days'] !== $form_config['days']) {
if (($entity_config['days'] ?? []) !== ($form_config['days'] ?? [])) {
$diff['days'] = [
'label' => t('Days'),
'stored' => implode(',', $entity_config['days']),
'override' => implode(',', $form_config['days']),
'stored' => implode(',', ($entity_config['days'] ?? [])),
'override' => implode(',', ($form_config['days'] ?? [])),
];
}
}
else {
if ($entity_config['day_of_month'] !== $form_config['day_of_month']) {
if (($entity_config['day_of_month'] ?? []) !== ($form_config['day_of_month'] ?? [])) {
$diff['day_of_month'] = [
'label' => t('Day of the Month'),
'stored' => implode(',', $entity_config['day_of_month']),
'override' => implode(',', $form_config['day_of_month']),
'stored' => implode(',', ($entity_config['day_of_month'] ?? [])),
'override' => implode(',', ($form_config['day_of_month'] ?? [])),
];
}
}
......
src/Plugin/Field/FieldType/WeeklyRecurringDate.php
+ 9
− 9
View file @ 32034295
......@@ -124,26 +124,26 @@ class WeeklyRecurringDate extends DailyRecurringDate implements RecurringEventsF
'override' => $form_config['end_date']->format(DateTimeItemInterface::DATE_STORAGE_FORMAT),
];
}
if ($entity_config['time'] !== $form_config['time']) {
if (($entity_config['time'] ?? '') !== ($form_config['time'] ?? '')) {
$diff['time'] = [
'label' => t('Time'),
'stored' => $entity_config['time'],
'override' => $form_config['time'],
'stored' => $entity_config['time'] ?? '',
'override' => $form_config['time'] ?? '',
];
}
if ($entity_config['duration'] !== $form_config['duration']) {
if (($entity_config['duration'] ?? '') !== ($form_config['duration'] ?? '')) {
$diff['duration'] = [
'label' => t('Duration'),
'stored' => $entity_config['duration'],
'override' => $form_config['duration'],
'stored' => $entity_config['duration'] ?? '',
'override' => $form_config['duration'] ?? '',
];
}
if ($entity_config['days'] !== $form_config['days']) {
if (($entity_config['days'] ?? []) !== ($form_config['days'] ?? [])) {
$diff['days'] = [
'label' => t('Days'),
'stored' => implode(',', $entity_config['days']),
'override' => implode(',', $form_config['days']),
'stored' => implode(',', ($entity_config['days'] ?? [])),
'override' => implode(',', ($form_config['days'] ?? [])),
];
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment