diff --git a/app/controllers/application_controller/with_features.rb b/app/controllers/application_controller/with_features.rb index 65558824358f3b744b588946ca1fa01d4f5cb6bd..63f4f1710d216da179add653575d3d750ae7c790 100644 --- a/app/controllers/application_controller/with_features.rb +++ b/app/controllers/application_controller/with_features.rb @@ -12,7 +12,7 @@ module ApplicationController::WithFeatures def feature_research? current_university.is_really_a_university && ( can?(:read, Research::Journal) || - can?(:read, Research::Hal::Publication) || + can?(:read, Research::Publication) || can?(:read, Research::Laboratory) ) end diff --git a/app/models/ability/admin.rb b/app/models/ability/admin.rb index dd196ad2129812b2a913060de667ae0c16c7b055..452ad5ee3eebdb65c844b8127c45a907bf687c2a 100644 --- a/app/models/ability/admin.rb +++ b/app/models/ability/admin.rb @@ -36,7 +36,7 @@ class Ability::Admin < Ability def admin_research can :manage, Research::Hal::Author - can :manage, Research::Hal::Publication + can :manage, Research::Publication can :manage, Research::Journal, university_id: @user.university_id can :manage, Research::Journal::Paper, university_id: @user.university_id can :manage, Research::Journal::Paper::Kind, university_id: @user.university_id diff --git a/app/models/communication/website/permalink.rb b/app/models/communication/website/permalink.rb index 8cb36d8ac848dc89602e0d46e4ff62a8beb6db2d..d2f0ecb80c46c78b678b3535a1df4f090e4d2fe6 100644 --- a/app/models/communication/website/permalink.rb +++ b/app/models/communication/website/permalink.rb @@ -35,7 +35,7 @@ class Communication::Website::Permalink < ApplicationRecord "Education::Program" => Communication::Website::Permalink::Program, "Research::Journal::Paper" => Communication::Website::Permalink::Paper, "Research::Journal::Volume" => Communication::Website::Permalink::Volume, - "Research::Hal::Publication" => Communication::Website::Permalink::Publication, + "Research::Publication" => Communication::Website::Permalink::Publication, "University::Organization" => Communication::Website::Permalink::Organization, "University::Person" => Communication::Website::Permalink::Person, "University::Person::Administrator" => Communication::Website::Permalink::Administrator, diff --git a/app/views/admin/research/researchers/index.html.erb b/app/views/admin/research/researchers/index.html.erb index 805f5a533c17b107e40ad41474d8e74c216a4f43..3873fce410aa235c49876b0bd4aadb1248f30a79 100644 --- a/app/views/admin/research/researchers/index.html.erb +++ b/app/views/admin/research/researchers/index.html.erb @@ -9,7 +9,7 @@ <th><%= University::Person.human_attribute_name('name') %></th> <th><%= University::Person.human_attribute_name('first_name') %></th> <th><%= University::Person.human_attribute_name('picture') %></th> - <th><%= Research::Hal::Publication.model_name.human(count: 2) %></th> + <th><%= Research::Publication.model_name.human(count: 2) %></th> <th><%= Research::Journal::Paper.model_name.human(count: 2) %></th> <th width="160"></th> </tr>