mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-20 03:25:17 +01:00
Code Issues Projects Releases Wiki Activity

Add date_range view helper (#32187)

Browse Source
This commit is contained in:
Matt Jankowski 2024-10-01 05:30:21 -04:00 committed by GitHub
parent 7a653001b4
commit f251edfc1d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/helpers/admin/dashboard_helper.rb
View File

@ -18,6 +18,11 @@ module Admin::DashboardHelper
end end
end end
def date_range(range)
[l(range.first), l(range.last)]
.join(' - ')
end
def relevant_account_timestamp(account) def relevant_account_timestamp(account)
timestamp, exact = if account.user_current_sign_in_at && account.user_current_sign_in_at < 24.hours.ago timestamp, exact = if account.user_current_sign_in_at && account.user_current_sign_in_at < 24.hours.ago
[account.user_current_sign_in_at, true] [account.user_current_sign_in_at, true]

4
app/views/admin/dashboard/index.html.haml
View File

@ -2,9 +2,7 @@
= t('admin.dashboard.title') = t('admin.dashboard.title')
- content_for :heading_actions do - content_for :heading_actions do
= l(@time_period.first) = date_range(@time_period)
= ' - '
= l(@time_period.last)
- unless @system_checks.empty? - unless @system_checks.empty?
.flash-message-stack .flash-message-stack

4
app/views/admin/instances/show.html.haml
View File

@ -3,9 +3,7 @@
- if current_user.can?(:view_dashboard) - if current_user.can?(:view_dashboard)
- content_for :heading_actions do - content_for :heading_actions do
= l(@time_period.first) = date_range(@time_period)
= ' - '
= l(@time_period.last)
- if @instance.persisted? - if @instance.persisted?
= render 'dashboard', instance_domain: @instance.domain, period_end_at: @time_period.last, period_start_at: @time_period.first = render 'dashboard', instance_domain: @instance.domain, period_end_at: @time_period.last, period_start_at: @time_period.first

4
app/views/admin/tags/show.html.haml
View File

@ -4,9 +4,7 @@
- content_for :heading_actions do - content_for :heading_actions do
- if current_user.can?(:view_dashboard) - if current_user.can?(:view_dashboard)
.time-period .time-period
= l(@time_period.first) = date_range(@time_period)
= ' - '
= l(@time_period.last)
= link_to t('admin.tags.open'), tag_url(@tag), class: 'button', target: '_blank', rel: 'noopener noreferrer' = link_to t('admin.tags.open'), tag_url(@tag), class: 'button', target: '_blank', rel: 'noopener noreferrer'