From 009990760008e434e262e3c7bfdb22eeadfd9aca Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 18 Mar 2025 22:39:13 +0100 Subject: [PATCH] Fix error when terms of service are missing an effective date (#34200) --- app/serializers/rest/terms_of_service_serializer.rb | 2 +- app/views/admin/terms_of_service/index.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/serializers/rest/terms_of_service_serializer.rb b/app/serializers/rest/terms_of_service_serializer.rb index 7f48788693..373cb8b56f 100644 --- a/app/serializers/rest/terms_of_service_serializer.rb +++ b/app/serializers/rest/terms_of_service_serializer.rb @@ -4,7 +4,7 @@ class REST::TermsOfServiceSerializer < ActiveModel::Serializer attributes :effective_date, :effective, :content, :succeeded_by def effective_date - object.effective_date.iso8601 + (object.effective_date || object.published_at).iso8601 end def effective diff --git a/app/views/admin/terms_of_service/index.html.haml b/app/views/admin/terms_of_service/index.html.haml index 457ef42670..636851b449 100644 --- a/app/views/admin/terms_of_service/index.html.haml +++ b/app/views/admin/terms_of_service/index.html.haml @@ -11,7 +11,7 @@ .dot-indicator.success .dot-indicator__indicator %span - - if @terms_of_service.effective? + - if @terms_of_service.effective? || @terms_of_service.effective_date.nil? = t('admin.terms_of_service.live') - else = t('admin.terms_of_service.going_live_on_html', date: tag.time(l(@terms_of_service.effective_date), class: 'formatted', date: @terms_of_service.effective_date.iso8601))