diff --git a/app/controllers/admin/application_controller.rb b/app/controllers/admin/application_controller.rb index 73fbd9990b32aa550c4929e9caa13ec5cfcb1262..edd21493eaff454a34c888c26d3db88747f97208 100644 --- a/app/controllers/admin/application_controller.rb +++ b/app/controllers/admin/application_controller.rb @@ -15,13 +15,9 @@ class Admin::ApplicationController < ApplicationController end def short_breadcrumb - if current_admin_theme == 'appstack' - @menu_collapsed = true - add_breadcrumb t('admin.dashboard'), admin_root_path(website_id: nil) - add_breadcrumb '...' - else - breadcrumb - end + @menu_collapsed = true + add_breadcrumb t('admin.dashboard'), admin_root_path(website_id: nil) + add_breadcrumb '...' end def breadcrumb_for(object, **options) diff --git a/app/controllers/admin/education/application_controller.rb b/app/controllers/admin/education/application_controller.rb index 2fc99b4a74bf0263639b57b4f67a59f834ce98cf..63562bfc545d8f314bc03bbbe294b065721e3ff6 100644 --- a/app/controllers/admin/education/application_controller.rb +++ b/app/controllers/admin/education/application_controller.rb @@ -1,11 +1,10 @@ class Admin::Education::ApplicationController < Admin::ApplicationController - def breadcrumb - if @program - short_breadcrumb - else - super - add_breadcrumb Education.model_name.human - end + protected + + def breadcrumb + super + add_breadcrumb Education.model_name.human + @menu_collapsed = true if @program end end diff --git a/app/controllers/admin/research/application_controller.rb b/app/controllers/admin/research/application_controller.rb index 181ceaa185af59ab1dc650034edbee62ee94bbd5..3ab257c4435ac7310c6918e99ef2ed8a1029dce0 100644 --- a/app/controllers/admin/research/application_controller.rb +++ b/app/controllers/admin/research/application_controller.rb @@ -3,15 +3,8 @@ class Admin::Research::ApplicationController < Admin::ApplicationController protected def breadcrumb - if @journal - short_breadcrumb - breadcrumb_for @journal - elsif @laboratory - short_breadcrumb - breadcrumb_for @laboratory - else - super - add_breadcrumb Research.model_name.human - end + super + add_breadcrumb Research.model_name.human + @menu_collapsed = true if @journal || @laboratory end end diff --git a/app/controllers/admin/research/journals_controller.rb b/app/controllers/admin/research/journals_controller.rb index 048aaaef7d1dee966ad1213e3f027704aea1738a..c8f15e52e1255c996d26123308dbaeda8289e17e 100644 --- a/app/controllers/admin/research/journals_controller.rb +++ b/app/controllers/admin/research/journals_controller.rb @@ -53,6 +53,12 @@ class Admin::Research::JournalsController < Admin::Research::ApplicationControll protected + def breadcrumb + super + add_breadcrumb Research::Journal.model_name.human(count: 2), admin_research_journals_path + breadcrumb_for @journal + end + def journal_params params.require(:research_journal) .permit(:title, :meta_description, :summary, :issn)