0
0
Fork 0

Fix subscription expiration condition (#2715)

* Fix subscription expiration condition

* dry and add spec
This commit is contained in:
Yamagishi Kazutoshi 2017-05-03 01:21:22 +09:00 committed by Eugen Rochko
parent b9b78549f3
commit 6f75c8451d
3 changed files with 20 additions and 3 deletions

View file

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