diff --git a/app/controllers/admin/research/publications_controller.rb b/app/controllers/admin/research/publications_controller.rb index 9861abbbe7f4d0d4233b1d60c10f5539e338036b..8f78f046d986c20aee6da2c0ce2ad2a05ad18db5 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 cb7b016fd504297bd4a08007425e30ae79a7bfad..de9b4683d4b83f6d4db46a0e9660b61d6012f7a2 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