From 6f75c8451d5668cc1505b192f29cf2f0dda48f7e Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Wed, 3 May 2017 01:21:22 +0900 Subject: Fix subscription expiration condition (#2715) * Fix subscription expiration condition * dry and add spec --- app/views/admin/pubsubhubbub/index.html.haml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'app/views/admin') diff --git a/app/views/admin/pubsubhubbub/index.html.haml b/app/views/admin/pubsubhubbub/index.html.haml index 60a0b40b0..852e84f11 100644 --- a/app/views/admin/pubsubhubbub/index.html.haml +++ b/app/views/admin/pubsubhubbub/index.html.haml @@ -11,7 +11,6 @@ %th= t('admin.pubsubhubbub.last_delivery') %tbody - @subscriptions.each do |subscription| - - expired = Time.now.utc < subscription.expires_at %tr %td %samp= subscription.account.acct @@ -20,8 +19,8 @@ %td - if subscription.confirmed? %i.fa.fa-check - %td{ style: "color: #{expired ? 'red' : 'inherit'};" } - = precede expired ? '-' : '' do + %td{ style: "color: #{subscription.expired? ? 'red' : 'inherit'};" } + = precede subscription.expired? ? '-' : '' do = time_ago_in_words(subscription.expires_at) %td - if subscription.last_successful_delivery_at? -- cgit