Add date_range view helper (#32187)
				
					
				
			This commit is contained in:
		
							parent
							
								
									7a653001b4
								
							
						
					
					
						commit
						f251edfc1d
					
				@ -18,6 +18,11 @@ module Admin::DashboardHelper
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def date_range(range)
 | 
			
		||||
    [l(range.first), l(range.last)]
 | 
			
		||||
      .join(' - ')
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def relevant_account_timestamp(account)
 | 
			
		||||
    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]
 | 
			
		||||
 | 
			
		||||
@ -2,9 +2,7 @@
 | 
			
		||||
  = t('admin.dashboard.title')
 | 
			
		||||
 | 
			
		||||
- content_for :heading_actions do
 | 
			
		||||
  = l(@time_period.first)
 | 
			
		||||
  = ' - '
 | 
			
		||||
  = l(@time_period.last)
 | 
			
		||||
  = date_range(@time_period)
 | 
			
		||||
 | 
			
		||||
- unless @system_checks.empty?
 | 
			
		||||
  .flash-message-stack
 | 
			
		||||
 | 
			
		||||
@ -3,9 +3,7 @@
 | 
			
		||||
 | 
			
		||||
- if current_user.can?(:view_dashboard)
 | 
			
		||||
  - content_for :heading_actions do
 | 
			
		||||
    = l(@time_period.first)
 | 
			
		||||
    = ' - '
 | 
			
		||||
    = l(@time_period.last)
 | 
			
		||||
    = date_range(@time_period)
 | 
			
		||||
 | 
			
		||||
  - if @instance.persisted?
 | 
			
		||||
    = render 'dashboard', instance_domain: @instance.domain, period_end_at: @time_period.last, period_start_at: @time_period.first
 | 
			
		||||
 | 
			
		||||
@ -4,9 +4,7 @@
 | 
			
		||||
- content_for :heading_actions do
 | 
			
		||||
  - if current_user.can?(:view_dashboard)
 | 
			
		||||
    .time-period
 | 
			
		||||
      = l(@time_period.first)
 | 
			
		||||
      = ' - '
 | 
			
		||||
      = l(@time_period.last)
 | 
			
		||||
      = date_range(@time_period)
 | 
			
		||||
 | 
			
		||||
  = link_to t('admin.tags.open'), tag_url(@tag), class: 'button', target: '_blank', rel: 'noopener noreferrer'
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user