From 22eee799142046bf3040aa063c7748ec2876d4a9 Mon Sep 17 00:00:00 2001
From: owenbush <ojb@ukhhf.co.uk>
Date: Sat, 8 Feb 2020 10:37:34 -0700
Subject: [PATCH] Adding back two changes which got lost when merging
consecutive dates
---
recurring_events.views.inc | 16 ++++++++++++++++
src/Form/EventInstanceSettingsForm.php | 2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/recurring_events.views.inc b/recurring_events.views.inc
index f64c0b95..d1b34940 100644
--- a/recurring_events.views.inc
+++ b/recurring_events.views.inc
@@ -55,4 +55,20 @@ function recurring_events_views_data_alter(array &$data) {
if (!$set) {
$data['eventinstance_field_data']['table']['base']['defaults']['field'] = 'id';
}
+
+ // @todo Remove these declarations when
+ // https://www.drupal.org/project/drupal/issues/2489476 is resolved.
+ $data['eventinstance_field_data']['date__value']['filter']['id'] = 'datetime';
+ $data['eventinstance_field_data']['date__value']['filter']['field_name'] = 'date';
+ $data['eventinstance_field_data']['date__value']['sort']['id'] = 'datetime';
+ $data['eventinstance_field_data']['date__value']['sort']['field_name'] = 'date';
+ $data['eventinstance_field_data']['date__value']['argument']['id'] = 'datetime';
+ $data['eventinstance_field_data']['date__value']['argument']['field_name'] = 'date';
+
+ $data['eventinstance_field_data']['date__end_value']['filter']['id'] = 'datetime';
+ $data['eventinstance_field_data']['date__end_value']['filter']['field_name'] = 'date';
+ $data['eventinstance_field_data']['date__end_value']['sort']['id'] = 'datetime';
+ $data['eventinstance_field_data']['date__end_value']['sort']['field_name'] = 'date';
+ $data['eventinstance_field_data']['date__end_value']['argument']['id'] = 'datetime';
+ $data['eventinstance_field_data']['date__end_value']['argument']['field_name'] = 'date';
}
diff --git a/src/Form/EventInstanceSettingsForm.php b/src/Form/EventInstanceSettingsForm.php
index b4572ca3..db8c0ae9 100644
--- a/src/Form/EventInstanceSettingsForm.php
+++ b/src/Form/EventInstanceSettingsForm.php
@@ -60,7 +60,7 @@ class EventInstanceSettingsForm extends ConfigFormBase {
* Form definition array.
*/
public function buildForm(array $form, FormStateInterface $form_state) {
- $config = $this->config('recurring_events.eventseries.config');
+ $config = $this->config('recurring_events.eventinstance.config');
$php_date_url = Url::fromUri('https://secure.php.net/manual/en/function.date.php');
$php_date_link = Link::fromTextAndUrl($this->t('PHP date/time format'), $php_date_url);
--
GitLab