From b017e7395d1958bd4ef164b24d81f2589c4645e4 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Wed, 8 Feb 2023 08:52:49 +0100
Subject: [PATCH] Fix #798
---
app/controllers/admin/application_controller.rb | 10 +++-------
.../admin/education/application_controller.rb | 13 ++++++-------
.../admin/research/application_controller.rb | 13 +++----------
.../admin/research/journals_controller.rb | 6 ++++++
4 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/app/controllers/admin/application_controller.rb b/app/controllers/admin/application_controller.rb
index 73fbd9990..edd21493e 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 2fc99b4a7..63562bfc5 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 181ceaa18..3ab257c44 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 048aaaef7..c8f15e52e 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)
--
GitLab