diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-27 02:13:34 +0200 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-21 01:19:07 -0600 |
| commit | 8a7020dde819bbabee6bd55dc8a0d3b8b51e258b (patch) | |
| tree | 49637924ee3ba4bcd540d92aa189889d879d0b7a /config | |
| parent | 4692c6033fe23c375651e55837550cfb33e49895 (diff) | |
port tootsuite#11963 to monsterfork: Fix relays UI being available in whitelist/secure mode
Fix relays UI referencing relay that is not functional
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 2 | ||||
| -rw-r--r-- | config/navigation.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index dd92e2d19..27d05800a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -281,6 +281,7 @@ en: updated_msg: Emoji successfully updated! upload: Upload dashboard: + authorized_fetch_mode: Secure mode backlog: backlogged jobs config: Configuration feature_deletions: Account deletions @@ -410,6 +411,7 @@ en: pending: Waiting for relay's approval save_and_enable: Save and enable setup: Setup a relay connection + signatures_not_enabled: Relays will not work correctly while secure mode or whitelist mode is enabled status: Status title: Relays report_notes: diff --git a/config/navigation.rb b/config/navigation.rb index 6f344d495..5d1c8c821 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -50,6 +50,7 @@ SimpleNavigation::Configuration.run do |navigation| n.item :admin, safe_join([fa_icon('cogs fw'), t('admin.title')]), admin_dashboard_url, if: proc { current_user.staff? && !current_user.defanged? } do |s| s.item :dashboard, safe_join([fa_icon('tachometer fw'), t('admin.dashboard.title')]), admin_dashboard_url s.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), edit_admin_settings_url, if: -> { current_user.admin? && !current_user.defanged? }, highlights_on: %r{/admin/settings} + s.item :relays, safe_join([fa_icon('exchange fw'), t('admin.relays.title')]), admin_relays_url, if: -> { current_user.admin? && !current_user.defanged? && !whitelist_mode? }, highlights_on: %r{/admin/relays} s.item :relays, safe_join([fa_icon('exchange fw'), t('admin.relays.title')]), admin_relays_url, if: -> { current_user.admin? && !current_user.defanged? }, highlights_on: %r{/admin/relays} s.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_url, link_html: { target: 'sidekiq' }, if: -> { current_user.admin? && !current_user.defanged? } s.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_url, link_html: { target: 'pghero' }, if: -> { current_user.admin? && !current_user.defanged? } |