diff --git a/app/controllers/server/application_controller.rb b/app/controllers/server/application_controller.rb index 01fcffda36de6ae6ae8f6277f0843b8603c06762..b85c0802f779691a2dcf4eb5036c2126bbffb43d 100644 --- a/app/controllers/server/application_controller.rb +++ b/app/controllers/server/application_controller.rb @@ -1,7 +1,7 @@ class Server::ApplicationController < ApplicationController layout 'server/layouts/application' - before_action :authenticate_user!, :ensure_user_if_superadmin + before_action :authenticate_user!, :ensure_user_if_server_admin protected @@ -9,7 +9,7 @@ class Server::ApplicationController < ApplicationController add_breadcrumb 'Tableau de bord', :server_root_path end - def ensure_user_if_superadmin - raise CanCan::AccessDenied unless current_user.superadmin? + def ensure_user_if_server_admin + raise CanCan::AccessDenied unless current_user.server_admin? end end diff --git a/app/models/ability.rb b/app/models/ability.rb index bdbba796ba00728fa0faa83cdb38ab074d86dfbb..699026b132db20b2d6987515f3fe5f4f2a51a143 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -45,7 +45,7 @@ class Ability can :manage, User, university_id: @user.university_id, role: @user.managed_roles end - def superadmin + def server_admin can :manage, :all end end diff --git a/app/models/user/with_authentication.rb b/app/models/user/with_authentication.rb index 80e647f25b63953869c35d051be223d3ea56f9f4..6f8b27749a82081f3c9957e3a2783dee4babf775 100644 --- a/app/models/user/with_authentication.rb +++ b/app/models/user/with_authentication.rb @@ -74,7 +74,7 @@ module User::WithAuthentication def set_default_role if User.all.empty? - role = :superadmin + role = :server_admin elsif university.users.empty? role = :admin else