zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 14 Releases Wiki Activity

Fix error when terms of service are missing an effective date (#34200)

This commit is contained in:
Eugen Rochko 2025-03-18 22:39:13 +01:00 committed by GitHub
parent 547658f086
commit 0099907600
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/serializers/rest/terms_of_service_serializer.rb
View File

@ -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

2
app/views/admin/terms_of_service/index.html.haml
View File

@ -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))