From c70a5e8295fc51cc723fa934693f9fe7ecdf04b9 Mon Sep 17 00:00:00 2001
From: MrPaulDriver <MrPaulDriver@467650.no-reply.drupal.org>
Date: Fri, 24 Apr 2020 15:39:59 -0600
Subject: [PATCH] Issue #3114533 by MrPaulDriver, Snehal Brahmbhatt, owenbush,
the_glitch: Event series form: Incorrect display order for dates and
registration config
---
.../recurring_events_registration.install | 2 +-
.../recurring_events_registration.module | 2 +-
src/Entity/EventInstance.php | 2 +-
src/Entity/EventSeries.php | 32 +++++++++----------
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/modules/recurring_events_registration/recurring_events_registration.install b/modules/recurring_events_registration/recurring_events_registration.install
index d8729792..aab9be8a 100644
--- a/modules/recurring_events_registration/recurring_events_registration.install
+++ b/modules/recurring_events_registration/recurring_events_registration.install
@@ -26,7 +26,7 @@ function recurring_events_registration_install() {
->setRequired(FALSE)
->setDisplayOptions('form', [
'type' => 'event_registration',
- 'weight' => 4,
+ 'weight' => 10,
]);
\Drupal::entityDefinitionUpdateManager()
diff --git a/modules/recurring_events_registration/recurring_events_registration.module b/modules/recurring_events_registration/recurring_events_registration.module
index 8de1734f..3b489adc 100644
--- a/modules/recurring_events_registration/recurring_events_registration.module
+++ b/modules/recurring_events_registration/recurring_events_registration.module
@@ -122,7 +122,7 @@ function recurring_events_registration_entity_base_field_info_alter(&$fields, En
->setTargetEntityTypeId($entity_type->id())
->setDisplayOptions('form', [
'type' => 'event_registration',
- 'weight' => 4,
+ 'weight' => 10,
]);
}
}
diff --git a/src/Entity/EventInstance.php b/src/Entity/EventInstance.php
index 917329c5..095cb3f4 100644
--- a/src/Entity/EventInstance.php
+++ b/src/Entity/EventInstance.php
@@ -389,7 +389,7 @@ class EventInstance extends EditorialContentEntityBase implements EventInterface
'settings' => [
'display_label' => TRUE,
],
- 'weight' => 120,
+ 'weight' => 12,
])
->setDisplayConfigurable('form', TRUE);
diff --git a/src/Entity/EventSeries.php b/src/Entity/EventSeries.php
index ccff5398..024b78e8 100644
--- a/src/Entity/EventSeries.php
+++ b/src/Entity/EventSeries.php
@@ -307,7 +307,7 @@ class EventSeries extends EditorialContentEntityBase implements EventInterface {
->setTranslatable(TRUE)
->setDisplayOptions('form', [
'type' => 'entity_reference_autocomplete',
- 'weight' => 5,
+ 'weight' => 11,
'settings' => [
'match_operator' => 'CONTAINS',
'size' => '60',
@@ -339,11 +339,11 @@ class EventSeries extends EditorialContentEntityBase implements EventInterface {
])
->setDisplayOptions('form', [
'type' => 'string_textfield',
- 'weight' => -6,
+ 'weight' => 0,
])
->setDisplayOptions('view', [
'label' => 'above',
- 'weight' => 10,
+ 'weight' => 0,
])
->setDisplayConfigurable('form', TRUE)
->setDisplayConfigurable('view', TRUE)
@@ -359,11 +359,11 @@ class EventSeries extends EditorialContentEntityBase implements EventInterface {
->setDisplayConfigurable('view', TRUE)
->setDisplayOptions('form', [
'type' => 'text_textarea',
- 'weight' => -4,
+ 'weight' => 1,
])
->setDisplayOptions('view', [
'label' => 'above',
- 'weight' => 10,
+ 'weight' => 1,
])
->setDisplayConfigurable('form', TRUE);
@@ -379,11 +379,11 @@ class EventSeries extends EditorialContentEntityBase implements EventInterface {
->setSetting('allowed_values_function', 'recurring_events_allowed_values_function')
->setDisplayOptions('form', [
'type' => 'options_buttons',
- 'weight' => 0,
+ 'weight' => 2,
])
->setDisplayOptions('view', [
'label' => 'above',
- 'weight' => 10,
+ 'weight' => 2,
]);
$fields['consecutive_recurring_date'] = BaseFieldDefinition::create('consecutive_recurring_date')
@@ -397,7 +397,7 @@ class EventSeries extends EditorialContentEntityBase implements EventInterface {
->setRequired(FALSE)
->setDisplayOptions('form', [
'type' => 'consecutive_recurring_date',
- 'weight' => 1,
+ 'weight' => 3,
]);
$fields['daily_recurring_date'] = BaseFieldDefinition::create('daily_recurring_date')
@@ -411,7 +411,7 @@ class EventSeries extends EditorialContentEntityBase implements EventInterface {
->setRequired(FALSE)
->setDisplayOptions('form', [
'type' => 'daily_recurring_date',
- 'weight' => 2,
+ 'weight' => 4,
]);
$fields['weekly_recurring_date'] = BaseFieldDefinition::create('weekly_recurring_date')
@@ -425,7 +425,7 @@ class EventSeries extends EditorialContentEntityBase implements EventInterface {
->setRequired(FALSE)
->setDisplayOptions('form', [
'type' => 'weekly_recurring_date',
- 'weight' => 3,
+ 'weight' => 5,
]);
$fields['monthly_recurring_date'] = BaseFieldDefinition::create('monthly_recurring_date')
@@ -439,7 +439,7 @@ class EventSeries extends EditorialContentEntityBase implements EventInterface {
->setRequired(FALSE)
->setDisplayOptions('form', [
'type' => 'monthly_recurring_date',
- 'weight' => 4,
+ 'weight' => 6,
]);
$fields['custom_date'] = BaseFieldDefinition::create('daterange')
@@ -453,7 +453,7 @@ class EventSeries extends EditorialContentEntityBase implements EventInterface {
->setRequired(FALSE)
->setDisplayOptions('form', [
'type' => 'daterange_default',
- 'weight' => 5,
+ 'weight' => 7,
]);
$fields['excluded_dates'] = BaseFieldDefinition::create('daterange')
@@ -468,7 +468,7 @@ class EventSeries extends EditorialContentEntityBase implements EventInterface {
->setSetting('datetime_type', 'date')
->setDisplayOptions('form', [
'type' => 'daterange_default',
- 'weight' => 6,
+ 'weight' => 8,
'settings' => [
'format_type' => 'html_date',
'datetime_type' => 'date',
@@ -487,7 +487,7 @@ class EventSeries extends EditorialContentEntityBase implements EventInterface {
->setSetting('datetime_type', 'date')
->setDisplayOptions('form', [
'type' => 'daterange_default',
- 'weight' => 6,
+ 'weight' => 9,
'settings' => [
'format_type' => 'html_date',
'datetime_type' => 'date',
@@ -503,7 +503,7 @@ class EventSeries extends EditorialContentEntityBase implements EventInterface {
->setDisplayOptions('view', [
'type' => 'recurring_events_eventinstance_date',
'label' => 'above',
- 'weight' => 10,
+ 'weight' => 3,
'settings' => [
'link' => TRUE,
'date_format' => 'F jS, Y h:iA',
@@ -533,7 +533,7 @@ class EventSeries extends EditorialContentEntityBase implements EventInterface {
'settings' => [
'display_label' => TRUE,
],
- 'weight' => 120,
+ 'weight' => 12,
])
->setDisplayConfigurable('form', TRUE);
--
GitLab