UHF-10259: Remove disable_field dependencies

City-of-Helsinki · Oct 21, 2024 · 9c14e55 · 9c14e55
1 parent 7603be8
commit 9c14e55
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/...nt_list/config/install/field.field.paragraph.curated_event_list.field_all_events_link.yml b/...nt_list/config/install/field.field.paragraph.curated_event_list.field_all_events_link.yml
@@ -6,12 +6,7 @@ dependencies:
     - field.storage.paragraph.field_all_events_link
     - paragraphs.paragraphs_type.curated_event_list
   module:
-    - disable_field
     - link
-third_party_settings:
-  disable_field:
-    add_disable: none
-    edit_disable: none
 id: paragraph.curated_event_list.field_all_events_link
 field_name: field_all_events_link
 entity_type: paragraph

diff --git a/...rated_event_list/config/install/field.field.paragraph.curated_event_list.field_events.yml b/...rated_event_list/config/install/field.field.paragraph.curated_event_list.field_events.yml
@@ -5,12 +5,6 @@ dependencies:
   config:
     - field.storage.paragraph.field_events
     - paragraphs.paragraphs_type.curated_event_list
-  module:
-    - disable_field
-third_party_settings:
-  disable_field:
-    add_disable: none
-    edit_disable: none
 id: paragraph.curated_event_list.field_events
 field_name: field_events
 entity_type: paragraph

diff --git a/modules/helfi_paragraphs_curated_event_list/helfi_paragraphs_curated_event_list.module b/modules/helfi_paragraphs_curated_event_list/helfi_paragraphs_curated_event_list.module
@@ -46,7 +46,9 @@ function helfi_paragraphs_curated_event_list_paragraph_view(
 
     foreach ($entities as $item) {
       $item->addCacheableDependency($entity);
-      $end_timestamp = $item->end_time->date->getTimeStamp();
+      /** @var \Drupal\datetime\Plugin\Field\FieldType\DateTimeItem */
+      $end_time = $item->get('end_time')->first();
+      $end_timestamp = $end_time->date->getTimeStamp();
       $has_ended = $end_timestamp < $time;
 
       $build[$has_ended ? 'past_events' : 'future_or_ongoing'][] = Drupal::entityTypeManager()