Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/admin/dashboard_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def index
@namespaces << Research if feature_research?
@namespaces << Communication if feature_communication?
@namespaces << Administration if feature_administration?
@namespaces << University if feature_settings?
@namespaces << University if feature_directory?
breadcrumb
end

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/admin/university/dashboard_controller.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class Admin::University::DashboardController < Admin::University::ApplicationController

def index
raise_403_unless feature_settings?
raise_403_unless feature_directory?
@namespace = University
breadcrumb
render 'admin/dashboard/namespace'
Expand Down
8 changes: 5 additions & 3 deletions app/controllers/application_controller/with_features.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,18 @@ def feature_communication?

def feature_administration?
current_university.is_really_a_university? &&
can?(:read, Administration::Qualiopi::Criterion)
can?(:read, Administration::Qualiopi) ||
can?(:read, Administration::Location) ||
can?(:read, University::Person::Alumnus)
end
helper_method :feature_administration?

def feature_settings?
def feature_directory?
can?(:read, University::Person) ||
can?(:read, University::Organization) ||
can?(:read, User)
end
helper_method :feature_settings?
helper_method :feature_directory?

end

Expand Down
29 changes: 29 additions & 0 deletions app/models/ability/alumni_manager.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
class Ability::AlumniManager < Ability

def initialize(user)
super
manage_blocks
can :manage, University::Person, university_id: @user.university_id
can :manage, University::Person::Category, university_id: @user.university_id
can :manage, University::Person::Experience, university_id: @user.university_id
can :manage, University::Person::Involvement, university_id: @user.university_id
can :manage, University::Person::Alumnus
can :manage, Import, university_id: @user.university_id
can :manage, Education::Program, university_id: @user.university_id
can :manage, Education::Program::Category, university_id: @user.university_id
can :manage, Education::School, university_id: @user.university_id
can :manage, Education::AcademicYear, university_id: @user.university_id
can :manage, Education::Cohort, university_id: @user.university_id
end

protected

def manage_blocks
can :manage, Communication::Block, university_id: @user.university_id, about_type: 'University::Person::Localization', about_id: University::Person::Localization.where(university_id: @user.university_id).pluck(:id)
can :manage, Communication::Block, university_id: @user.university_id, about_type: 'University::Person::Category::Localization', about_id: University::Person::Category::Localization.where(university_id: @user.university_id).pluck(:id)
can :manage, Communication::Block, university_id: @user.university_id, about_type: 'Education::Program::Localization', about_id: Education::Program::Localization.where(university_id: @user.university_id).pluck(:id)
can :manage, Communication::Block, university_id: @user.university_id, about_type: 'Education::Program::Category::Localization', about_id: Education::Program::Category::Localization.where(university_id: @user.university_id).pluck(:id)
can :create, Communication::Block
end

end
1 change: 1 addition & 0 deletions app/models/user/with_roles.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ module User::WithRoles
teacher: 10,
program_manager: 12,
website_manager: 15,
alumni_manager: 18,
admin: 20,
server_admin: 30
}
Expand Down
1 change: 1 addition & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ en:
role: Role
roles:
admin: Administrator
alumni_manager: Alumni Manager
author: Author
contributor: Contributor
program_manager: Program manager
Expand Down
1 change: 1 addition & 0 deletions config/locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ fr:
role: Rôle
roles:
admin: Administrateur
alumni_manager: Responsable des alumni
author: Auteur
contributor: Contributeur
program_manager: Responsable de formation
Expand Down
6 changes: 3 additions & 3 deletions config/navigation/admin/administration_navigation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
}
primary.item :subnav_alumni,
t('administration.description.parts.alumnus.title'),
admin_administration_alumni_path
admin_administration_alumni_path if can?(:read, University::Person::Alumnus)
primary.item :subnav_locations,
t('administration.description.parts.location.title'),
admin_administration_locations_path
admin_administration_locations_path if can?(:read, Administration::Location)
primary.item :subnav_qualiopi,
t('administration.description.parts.qualiopi.title'),
admin_administration_qualiopi_criterions_path,
highlights_on: lambda {
controller_name.in?(["indicators", "criterions"])
}
} if can?(:read, Administration::Qualiopi)
end
end
2 changes: 1 addition & 1 deletion config/navigation/admin_navigation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
secondary.item :directory_persons, University::Person.model_name.human(count: 2), admin_university_people_path
secondary.item :directory_organizations, University::Organization.model_name.human(count: 2), admin_university_organizations_path
secondary.item :directory_users, User.model_name.human(count: 2), admin_users_path
end if can?(:read, User)
end if can?(:read, University::Person) || can?(:read, University::Organization) || can?(:read, User)
end
end
11 changes: 6 additions & 5 deletions config/navigation/admin_university_navigation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,12 @@ def load_realm(realm, menu)
secondary.item :administration_statistics, 'Statistiques', nil
end
end

if feature_directory?
primary.item :directory, t('university.description.title'), admin_university_root_path, { image: 'admin/university-thumb.jpg' } do |secondary|
load_realm University, secondary
end
end

primary.item :directory, t('university.description.title'), admin_university_root_path, { image: 'admin/university-thumb.jpg' } do |secondary|
secondary.item :directory_persons, University::Person.model_name.human(count: 2), admin_university_people_path
secondary.item :directory_organizations, University::Organization.model_name.human(count: 2), admin_university_organizations_path
secondary.item :directory_users, User.model_name.human(count: 2), admin_users_path
end if can?(:read, User)
end
end
Loading