Add status to keyrelays

app/models/keyrelay.rb

@@ -18,14 +18,16 @@ class Keyrelay < ActiveRecord::Base
     }
   end
 
-  def status
+  def expiry
     if expiry_relative
-      exp_date = pa_date + ISO8601::Duration.new(expiry_relative).to_seconds
+      pa_date + ISO8601::Duration.new(expiry_relative).to_seconds
     elsif expiry_absolute
-      exp_date = expiry_positive
+      expiry_absolute
     end
+  end
 
-    if Time.now > exp_date
+  def status
+    if Time.now > expiry
       return 'expired'
     else
       return 'pending'

app/views/admin/domains/partials/_keyrelays.haml

@@ -6,15 +6,15 @@
       %thead
         %tr
           %th{class: 'col-xs-4'}= t('uploaded_at')
-          %th{class: 'col-xs-2'}= t('expiry_relative')
+          %th{class: 'col-xs-3'}= t('expiry')
-          %th{class: 'col-xs-2'}= t('expiry_absolute')
           %th{class: 'col-xs-2'}= t('requester')
           %th{class: 'col-xs-2'}= t('accepter')
+          %th{class: 'col-xs-1'}= t('status')
       %tbody
-        - @domain.keyrelays.includes([:requester, :accepter]).each do |x|
+        - @domain.keyrelays.includes([:requester, :accepter]).order(pa_date: :desc).each do |x|
           %tr
             %td= link_to(x.pa_date, [:admin, x])
-            %td= x.expiry_relative
+            %td= x.expiry
-            %td= x.expiry_absolute
             %td= link_to(x.requester, [:admin, x.requester])
             %td= link_to(x.accepter, [:admin, x.accepter])
+            %td= x.status

app/views/admin/keyrelays/show.haml

@@ -16,6 +16,9 @@
           %dt= t('domain')
           %dd= link_to(@keyrelay.domain, [:admin, @keyrelay.domain])
 
+          %dt= t('status')
+          %dd= @keyrelay.status
+
           %dt= t('flag')
           %dd= @keyrelay.key_data_flags