diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-25 05:17:15 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-25 05:17:15 +0000 |
| commit | 86f4f8e158deb57b2672d961f7c2dfc963e2a50c (patch) | |
| tree | eb0c60264b8885e3bce2c6a8322c3f800071c189 /config/navigation.rb | |
| parent | 167fe2ab08288ce286f5c7660ff0ed587b65b988 (diff) | |
| parent | 662b8eefe891c050e6befcb5736a9a5c417014b7 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/navigation.rb')
| -rw-r--r-- | config/navigation.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/navigation.rb b/config/navigation.rb index 4d46e4439..4ae931df0 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -30,7 +30,7 @@ SimpleNavigation::Configuration.run do |navigation| admin.item :email_domain_blocks, safe_join([fa_icon('envelope fw'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_url, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.admin? } end - primary.item :admin, safe_join([fa_icon('cogs fw'), t('admin.title')]), edit_admin_settings_url, if: proc { current_user.staff? } do |admin| + primary.item :admin, safe_join([fa_icon('cogs fw'), t('admin.title')]), proc { current_user.admin? ? edit_admin_settings_url : admin_custom_emojis_url }, if: proc { current_user.staff? } do |admin| admin.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), edit_admin_settings_url, if: -> { current_user.admin? } admin.item :custom_emojis, safe_join([fa_icon('smile-o fw'), t('admin.custom_emojis.title')]), admin_custom_emojis_url, highlights_on: %r{/admin/custom_emojis} admin.item :subscriptions, safe_join([fa_icon('paper-plane-o fw'), t('admin.subscriptions.title')]), admin_subscriptions_url, if: -> { current_user.admin? } |