diff options
| author | Starfall <root@starfall.blue> | 2020-02-04 17:44:29 -0600 |
|---|---|---|
| committer | Starfall <root@starfall.blue> | 2020-02-04 17:44:29 -0600 |
| commit | 6d24d3bcb84abd04f31da95f97f6d60ef0afdc00 (patch) | |
| tree | e7c38251a9e92bdf3a464b4aa7f1880aa5139bf0 /app/views/relationships | |
| parent | c0c9529df269816f52915a9802e5e30fbce9576b (diff) | |
| parent | 885e9227c6e8e1ce5e4a5625d5126ba76dce2c00 (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/views/relationships')
| -rw-r--r-- | app/views/relationships/_account.html.haml | 2 | ||||
| -rw-r--r-- | app/views/relationships/show.html.haml | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/app/views/relationships/_account.html.haml b/app/views/relationships/_account.html.haml index 6c22deb51..af5a4aaf7 100644 --- a/app/views/relationships/_account.html.haml +++ b/app/views/relationships/_account.html.haml @@ -14,7 +14,7 @@ %small= t('accounts.followers', count: account.followers_count).downcase %td.accounts-table__count - if account.last_status_at.present? - %time.time-ago{ datetime: account.last_status_at.iso8601, title: l(account.last_status_at) }= l account.last_status_at + %time.time-ago{ datetime: account.last_status_at.to_date.iso8601, title: l(account.last_status_at.to_date) }= l account.last_status_at - else \- %small= t('accounts.last_active') diff --git a/app/views/relationships/show.html.haml b/app/views/relationships/show.html.haml index 408390a35..a6f8cdc15 100644 --- a/app/views/relationships/show.html.haml +++ b/app/views/relationships/show.html.haml @@ -30,10 +30,9 @@ = form_for(@form, url: relationships_path, method: :patch) do |f| = hidden_field_tag :page, params[:page] || 1 - = hidden_field_tag :relationship, params[:relationship] - = hidden_field_tag :status, params[:status] - = hidden_field_tag :activity, params[:activity] - = hidden_field_tag :order, params[:order] + + - RelationshipFilter::KEYS.each do |key| + = hidden_field_tag key, params[key] if params[key].present? .batch-table .batch-table__toolbar |