maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix double render of Overview in admin navbar (#12857)

Browse source
This commit is contained in:
Jacob Herrington 2021-03-02 07:35:10 -06:00 • committed by GitHub
parent 76b199e438
commit 2ae6ca570e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/admin/shared/_navbar.html.erb
View file

@ -1,7 +1,3 @@
<a class="crayons-link crayons-link--block <%= "crayons-link--current" if controller.controller_name == "overview" %>" href="/admin/">
Overview
</a>
<% menu_items.each do |menu_item| %>
<a class="crayons-link crayons-link--block <%= "crayons-link--current" if request.path.split("/")[2]&.match?(menu_item[:controller]) %>" href="/admin/<%= menu_item[:controller] %>">
<%= menu_item[:name].to_s.titleize %>

3
app/views/layouts/admin.html.erb
View file

@ -53,6 +53,9 @@
<div class="crayons-layout crayons-layout--2-cols">
<div class="crayons-layout__left-sidebar">
<nav class="hidden m:block">
<a class="crayons-link crayons-link--block <%= "crayons-link--current" if controller.controller_name == "overview" %>" href="/admin/">
Overview
</a>
<%= render "admin/shared/navbar", menu_items: admin_menu_items %>
<% if FeatureFlag.enabled?(:data_update_scripts) %>
<p class="crayons-field__description mt-4 mb-3">Tech Resources</p>