diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-11-26 15:53:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-26 15:53:27 +0100 |
| commit | 73faadad28b897cd61cc1d6c8bee47e7d72a51a1 (patch) | |
| tree | fd3570cfa52aa1c31924b6d11af1257308f4db66 /app/helpers/stream_entries_helper.rb | |
| parent | db9aea34dead1b230e44b4235ff8af8100108b7f (diff) | |
Redesign admin accounts index (#9340)
* Improve overview of accounts in admin UI - Display suspended status, role, last activity and IP prominently - Default to showing local accounts - Default to not showing suspended accounts * Remove unused strings * Fix tests * Allow filtering accounts by IP mask
Diffstat (limited to 'app/helpers/stream_entries_helper.rb')
| -rw-r--r-- | app/helpers/stream_entries_helper.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index ac655f622..033d435c4 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -34,12 +34,14 @@ module StreamEntriesHelper end end - def account_badge(account) + def account_badge(account, all: false) if account.bot? content_tag(:div, content_tag(:div, t('accounts.roles.bot'), class: 'account-role bot'), class: 'roles') - elsif Setting.show_staff_badge && account.user_staff? + elsif (Setting.show_staff_badge && account.user_staff?) || all content_tag(:div, class: 'roles') do - if account.user_admin? + if all && !account.user_staff? + content_tag(:div, t('admin.accounts.roles.user'), class: 'account-role') + elsif account.user_admin? content_tag(:div, t('accounts.roles.admin'), class: 'account-role admin') elsif account.user_moderator? content_tag(:div, t('accounts.roles.moderator'), class: 'account-role moderator') |