From 5aebeecf798dd9750dae2b253f15f0f4f755fea6 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Fri, 10 Feb 2023 18:21:30 +0100
Subject: [PATCH] fix
---
app/controllers/admin/research/publications_controller.rb | 4 ++--
app/controllers/admin/research/researchers_controller.rb | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/controllers/admin/research/publications_controller.rb b/app/controllers/admin/research/publications_controller.rb
index 9861abbbe..8f78f046d 100644
--- a/app/controllers/admin/research/publications_controller.rb
+++ b/app/controllers/admin/research/publications_controller.rb
@@ -1,5 +1,5 @@
class Admin::Research::PublicationsController < Admin::Research::ApplicationController
- before_action :load, except: :index
+ before_action :load_publication, except: :index
def index
@publications = Research::Publication.ordered.page(params[:page])
@@ -17,7 +17,7 @@ class Admin::Research::PublicationsController < Admin::Research::ApplicationCont
protected
- def load
+ def load_publication
@publication = Research::Publication.find params[:id]
end
diff --git a/app/controllers/admin/research/researchers_controller.rb b/app/controllers/admin/research/researchers_controller.rb
index cb7b016fd..de9b4683d 100644
--- a/app/controllers/admin/research/researchers_controller.rb
+++ b/app/controllers/admin/research/researchers_controller.rb
@@ -1,5 +1,5 @@
class Admin::Research::ResearchersController < Admin::Research::ApplicationController
- before_action :load, except: :index
+ before_action :load_researcher, except: :index
has_scope :for_search_term
@@ -14,6 +14,7 @@ class Admin::Research::ResearchersController < Admin::Research::ApplicationContr
end
def show
+ @papers = @researcher.research_journal_papers.ordered.page(params[:page])
@possible_hal_authors = @researcher.possible_hal_authors unless @researcher.hal_identity?
@papers = @researcher.research_journal_papers.ordered.page(params[:page])
breadcrumb
@@ -34,13 +35,12 @@ class Admin::Research::ResearchersController < Admin::Research::ApplicationContr
protected
- def load
+ def load_researcher
@researcher = current_university.people
.for_language_id(current_university.default_language_id)
.researchers
.accessible_by(current_ability)
.find(params[:id])
- @papers = @researcher.research_journal_papers.ordered.page(params[:page])
end
def breadcrumb
--
GitLab