Skip to content
Snippets Groups Projects
Unverified Commit f463048e authored by Sébastien Gaya's avatar Sébastien Gaya
Browse files

ability

parent 82620d1e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 93 additions and 192 deletions
app/controllers/admin/universities_controller.rb deleted 100644 → 0
+ 0
− 61
View file @ 82620d1e
class Admin::UniversitiesController < Admin::ApplicationController
load_and_authorize_resource
def index
breadcrumb
end
def show
breadcrumb
end
def new
breadcrumb
end
def edit
breadcrumb
add_breadcrumb 'Modifier'
end
def create
if @university.save
redirect_to [:admin, @university], notice: "University was successfully created."
else
breadcrumb
render :new, status: :unprocessable_entity
end
end
def update
if @university.update(university_params)
redirect_to [:admin, @university], notice: "University was successfully updated."
else
breadcrumb
render :edit, status: :unprocessable_entity
end
end
def destroy
@university.destroy
redirect_to admin_universities_url, notice: "University was successfully destroyed."
end
protected
def breadcrumb
super
add_breadcrumb University.model_name.human(count: 2), admin_universities_path
if @university
if @university.persisted?
add_breadcrumb @university, [:admin, @university]
else
add_breadcrumb 'Créer'
end
end
end
def university_params
params.require(:university).permit(:name, :address, :zipcode, :city, :country, :private, :identifier)
end
end
app/controllers/admin/users_controller.rb
+ 4
− 2
View file @ f463048e
...@@ -20,19 +20,21 @@ class Admin::UsersController < Admin::ApplicationController ...@@ -20,19 +20,21 @@ class Admin::UsersController < Admin::ApplicationController
end end
def create def create
breadcrumb
if @user.save if @user.save
redirect_to [:admin, @user], notice: "User was successfully created." redirect_to [:admin, @user], notice: "User was successfully created."
else else
breadcrumb
render :new, status: :unprocessable_entity render :new, status: :unprocessable_entity
end end
end end
def update def update
breadcrumb @user.modified_by = current_user
if @user.update(user_params) if @user.update(user_params)
redirect_to [:admin, @user], notice: "User was successfully updated." redirect_to [:admin, @user], notice: "User was successfully updated."
else else
breadcrumb
add_breadcrumb 'Modifier'
render :edit, status: :unprocessable_entity render :edit, status: :unprocessable_entity
end end
end end
......
app/controllers/application_controller.rb
+ 1
− 0
View file @ f463048e
class ApplicationController < ActionController::Base class ApplicationController < ActionController::Base
include WithErrors
include WithLocale include WithLocale
include WithUniversity include WithUniversity
......
app/controllers/server/application_controller.rb
+ 5
− 1
View file @ f463048e
class Server::ApplicationController < ApplicationController class Server::ApplicationController < ApplicationController
layout 'server/layouts/application' layout 'server/layouts/application'
before_action :authenticate_user! before_action :authenticate_user!, :ensure_user_if_superadmin
protected protected
def breadcrumb def breadcrumb
add_breadcrumb 'Tableau de bord', :server_root_path add_breadcrumb 'Tableau de bord', :server_root_path
end end
def ensure_user_if_superadmin
raise CanCan::AccessDenied unless current_user.superadmin?
end
end end
app/models/ability.rb
+ 42
− 0
View file @ f463048e
...@@ -4,6 +4,48 @@ class Ability ...@@ -4,6 +4,48 @@ class Ability
include CanCan::Ability include CanCan::Ability
def initialize(user) def initialize(user)
@user = user ||= User.new # guest user (not logged in)
send @user.role.to_sym
end
protected
def visitor
can :read, Administration::Qualiopi::Criterion
can :read, Administration::Qualiopi::Indicator
can :read, Communication::Website, university_id: @user.university_id
can :read, Communication::Website::Page, university_id: @user.university_id
can :read, Communication::Website::Post, university_id: @user.university_id
can :read, Communication::Website::Imported::Website, university_id: @user.university_id
can :read, Communication::Website::Imported::Page, university_id: @user.university_id
can :read, Communication::Website::Imported::Post, university_id: @user.university_id
can :read, Education::Program, university_id: @user.university_id
can :read, Research::Researcher
can :read, Research::Journal, university_id: @user.university_id
can :read, Research::Journal::Article, university_id: @user.university_id
can :read, Research::Journal::Volume, university_id: @user.university_id
can :read, User, university_id: @user.university_id
end
def admin
can :read, Administration::Qualiopi::Criterion
can :read, Administration::Qualiopi::Indicator
can :manage, Communication::Website, university_id: @user.university_id
can :manage, Communication::Website::Page, university_id: @user.university_id
can :manage, Communication::Website::Post, university_id: @user.university_id
can :manage, Communication::Website::Imported::Website, university_id: @user.university_id
can :manage, Communication::Website::Imported::Page, university_id: @user.university_id
can :manage, Communication::Website::Imported::Post, university_id: @user.university_id
can :manage, Education::Program, university_id: @user.university_id
can :manage, Research::Researcher
can :manage, Research::Journal, university_id: @user.university_id
can :manage, Research::Journal::Article, university_id: @user.university_id
can :manage, Research::Journal::Volume, university_id: @user.university_id
can :read, User, university_id: @user.university_id
can :manage, User, university_id: @user.university_id, role: @user.managed_roles
end
def superadmin
can :manage, :all can :manage, :all
end end
end end
app/models/user/with_roles.rb
+ 2
− 2
View file @ f463048e
...@@ -10,7 +10,7 @@ module User::WithRoles ...@@ -10,7 +10,7 @@ module User::WithRoles
before_validation :check_modifier_role before_validation :check_modifier_role
def roles_managed def managed_roles
User.roles.map do |role_name, role_id| User.roles.map do |role_name, role_id|
next if role_id > User.roles[role] next if role_id > User.roles[role]
role_name role_name
...@@ -20,7 +20,7 @@ module User::WithRoles ...@@ -20,7 +20,7 @@ module User::WithRoles
protected protected
def check_modifier_role def check_modifier_role
errors.add(:role, 'cannot be set to this role') if modified_by && !modified_by.roles_managed.include?(self.role) errors.add(:role, 'cannot be set to this role') if modified_by && !modified_by.managed_roles.include?(self.role)
end end
end end
......
app/views/admin/universities/_form.html.erb deleted 100644 → 0
+ 0
− 24
View file @ 82620d1e
<%= simple_form_for [:admin, university] do |f| %>
<div class="row">
<div class="col-md-4">
<%= f.input :name %>
<%= f.input :identifier %>
<%= f.input :private %>
</div>
<div class="col-md-8">
<%= f.input :address %>
<div class="row">
<div class="col-md-4">
<%= f.input :zipcode %>
</div>
<div class="col-md-8">
<%= f.input :city %>
</div>
</div>
<%= f.input :country %>
</div>
</div>
<% content_for :buttons do %>
<%= submit f %>
<% end %>
<% end %>
app/views/admin/universities/edit.html.erb deleted 100644 → 0
+ 0
− 3
View file @ 82620d1e
<% content_for :title, @university %>
<%= render 'form', university: @university %>
app/views/admin/universities/index.html.erb deleted 100644 → 0
+ 0
− 29
View file @ 82620d1e
<% content_for :title, University.model_name.human(count: 2) %>
<table class="table">
<thead>
<tr>
<th><%= University.human_attribute_name('name') %></th>
<th><%= University.human_attribute_name('url') %></th>
<th><%= University.human_attribute_name('public_or_private') %></th>
<th></th>
</tr>
</thead>
<tbody>
<% @universities.each do |university| %>
<tr>
<td><%= link_to university, [:admin, university] %></td>
<td><%= link_to university.url, university.url, target: :_blank %></td>
<td><%= university.private ? University.human_attribute_name('private') : University.human_attribute_name('public') %></td>
<td class="text-end">
<%= edit_link university %>
<%= destroy_link university %>
</td>
</tr>
<% end %>
</tbody>
</table>
<% content_for :buttons do %>
<%= create_link University %>
<% end %>
app/views/admin/universities/new.html.erb deleted 100644 → 0
+ 0
− 3
View file @ 82620d1e
<% content_for :title, University.model_name.human %>
<%= render 'form', university: @university %>
app/views/admin/universities/show.html.erb deleted 100644 → 0
+ 0
− 34
View file @ 82620d1e
<% content_for :title, @university %>
<p>
<%= link_to @university.url, @university.url, target: :_blank %>
</p>
<p>
<strong>Address:</strong>
<%= @university.address %>
</p>
<p>
<strong>Zipcode:</strong>
<%= @university.zipcode %>
</p>
<p>
<strong>City:</strong>
<%= @university.city %>
</p>
<p>
<strong>Country:</strong>
<%= @university.country %>
</p>
<p>
<strong>Private:</strong>
<%= @university.private %>
</p>
<% content_for :buttons do %>
<%= edit_link @university %>
<% end %>
app/views/admin/users/_form.html.erb
+ 1
− 1
View file @ f463048e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<%= f.input :email %> <%= f.input :email %>
<%#= f.input :role %> <%= f.input :role, include_blank: false, collection: current_user.managed_roles %>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<%= f.input :first_name %> <%= f.input :first_name %>
......
app/views/admin/users/index.html.erb
+ 2
− 0
View file @ f463048e
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<th><%= User.human_attribute_name('email') %></th> <th><%= User.human_attribute_name('email') %></th>
<th><%= User.human_attribute_name('first_name') %></th> <th><%= User.human_attribute_name('first_name') %></th>
<th><%= User.human_attribute_name('last_name') %></th> <th><%= User.human_attribute_name('last_name') %></th>
<th><%= User.human_attribute_name('role') %></th>
<th><%= User.human_attribute_name('language') %></th> <th><%= User.human_attribute_name('language') %></th>
<th></th> <th></th>
</tr> </tr>
...@@ -16,6 +17,7 @@ ...@@ -16,6 +17,7 @@
<td><%= link_to user.email, [:admin, user] %></td> <td><%= link_to user.email, [:admin, user] %></td>
<td><%= user.first_name %></td> <td><%= user.first_name %></td>
<td><%= user.last_name %></td> <td><%= user.last_name %></td>
<td><%= user.role.humanize %></td>
<td><%= user.language %></td> <td><%= user.language %></td>
<td class="text-end"> <td class="text-end">
<%= edit_link user %> <%= edit_link user %>
......
config/admin_navigation.rb
+ 29
− 21
View file @ f463048e
...@@ -6,29 +6,37 @@ SimpleNavigation::Configuration.run do |navigation| ...@@ -6,29 +6,37 @@ SimpleNavigation::Configuration.run do |navigation|
navigation.items do |primary| navigation.items do |primary|
primary.item :dashboard, t('dashboard'), admin_root_path, { icon: 'tachometer-alt', highlights_on: /admin$/ } primary.item :dashboard, t('dashboard'), admin_root_path, { icon: 'tachometer-alt', highlights_on: /admin$/ }
primary.item :teaching, Education.model_name.human, nil, { kind: :header } if can?(:read, Education::Program)
primary.item :teaching, 'Enseignants', nil, { icon: 'user-graduate' } primary.item :education, Education.model_name.human, nil, { kind: :header }
primary.item :teaching, 'Ecoles', nil, { icon: 'university' } primary.item :education, 'Enseignants', nil, { icon: 'user-graduate' }
primary.item :education, Education::Program.model_name.human(count: 2), admin_education_programs_path, { icon: 'graduation-cap' } primary.item :education, 'Ecoles', nil, { icon: 'university' }
primary.item :teaching, 'Ressources éducatives', nil, { icon: 'laptop' } primary.item :education_programs, Education::Program.model_name.human(count: 2), admin_education_programs_path, { icon: 'graduation-cap' } if can?(:read, Education::Program)
primary.item :teaching, 'Feedbacks', nil, { icon: 'comments' } primary.item :education, 'Ressources éducatives', nil, { icon: 'laptop' }
primary.item :education, 'Feedbacks', nil, { icon: 'comments' }
end
primary.item :teaching, Research.model_name.human, nil, { kind: :header } if can?(:read, Research::Researcher) || can?(:read, Research::Journal)
primary.item :teaching, Research::Researcher.model_name.human(count: 2), admin_research_researchers_path(journal_id: nil), { icon: 'microscope' } primary.item :research, Research.model_name.human, nil, { kind: :header }
primary.item :teaching, 'Laboratoires', nil, { icon: 'flask' } primary.item :research_researchers, Research::Researcher.model_name.human(count: 2), admin_research_researchers_path(journal_id: nil), { icon: 'microscope' } if can?(:read, Research::Researcher)
primary.item :teaching, 'Veille', nil, { icon: 'eye' } primary.item :research, 'Laboratoires', nil, { icon: 'flask' }
primary.item :journals, Research::Journal.model_name.human(count: 2), admin_research_journals_path, { icon: 'newspaper' } primary.item :research, 'Veille', nil, { icon: 'eye' }
primary.item :research_journals, Research::Journal.model_name.human(count: 2), admin_research_journals_path, { icon: 'newspaper' } if can?(:read, Research::Journal)
end
primary.item :teaching, 'Communication', nil, { kind: :header } if can?(:read, Communication::Website)
primary.item :websites, 'Sites Web', admin_communication_websites_path, { icon: 'sitemap' } primary.item :communication, 'Communication', nil, { kind: :header }
primary.item :teaching, 'Lettres d\'information', nil, { icon: 'envelope' } primary.item :communication_websites, 'Sites Web', admin_communication_websites_path, { icon: 'sitemap' } if can?(:read, Communication::Website)
primary.item :teaching, 'Alumni', nil, { icon: 'users' } primary.item :communication, 'Lettres d\'information', nil, { icon: 'envelope' }
primary.item :communication, 'Alumni', nil, { icon: 'users' }
end
primary.item :teaching, 'Administration', nil, { kind: :header } if can?(:read, User) || can?(:read, Administration::Qualiopi::Criterion)
primary.item :users, User.model_name.human(count: 2), admin_users_path, { icon: 'user' } primary.item :administration, 'Administration', nil, { kind: :header }
primary.item :settings, 'Campus', nil, { icon: 'map-marker-alt' } primary.item :administration_users, User.model_name.human(count: 2), admin_users_path, { icon: 'user' } if can?(:read, User)
primary.item :settings, 'Admissions', nil, { icon: 'door-open' } primary.item :administration, 'Campus', nil, { icon: 'map-marker-alt' }
primary.item :settings, 'Statistiques', nil, { icon: 'cog' } primary.item :administration, 'Admissions', nil, { icon: 'door-open' }
primary.item :settings, 'Qualité', admin_administration_qualiopi_criterions_path, { icon: 'tasks' } primary.item :administration, 'Statistiques', nil, { icon: 'cog' }
primary.item :administration_qualiopi, 'Qualité', admin_administration_qualiopi_criterions_path, { icon: 'tasks' } if can?(:read, Administration::Qualiopi::Criterion)
end
end end
end end
config/routes.rb
+ 5
− 9
View file @ f463048e
...@@ -7,18 +7,14 @@ Rails.application.routes.draw do ...@@ -7,18 +7,14 @@ Rails.application.routes.draw do
unlocks: 'users/unlocks' unlocks: 'users/unlocks'
} }
resources :languages
namespace :admin do namespace :admin do
resources :users do resources :users do
member do patch 'unlock' => 'users#unlock', on: :member
patch 'unlock' => 'users#unlock'
end
end end
draw 'education' draw 'admin/administration'
draw 'research' draw 'admin/communication'
draw 'communication' draw 'admin/education'
draw 'administration' draw 'admin/research'
root to: 'dashboard#index' root to: 'dashboard#index'
end end
......
config/routes/education.rb → config/routes/admin/education.rb
+ 0
− 0
View file @ f463048e
File moved
config/routes/research.rb → config/routes/admin/research.rb
+ 0
− 0
View file @ f463048e
File moved
config/server_navigation.rb
+ 2
− 2
View file @ f463048e
...@@ -5,7 +5,7 @@ SimpleNavigation::Configuration.run do |navigation| ...@@ -5,7 +5,7 @@ SimpleNavigation::Configuration.run do |navigation|
navigation.selected_class = 'active' navigation.selected_class = 'active'
navigation.items do |primary| navigation.items do |primary|
primary.item :dashboard, t('dashboard'), server_root_path, { icon: 'tachometer-alt', highlights_on: %r{adminserver$} } primary.item :dashboard, t('dashboard'), server_root_path, { icon: 'tachometer-alt', highlights_on: %r{adminserver$} }
primary.item :universities, University.model_name.human(count: 2), server_universities_path, { icon: 'university' } primary.item :universities, University.model_name.human(count: 2), server_universities_path, { icon: 'university' } if can?(:read, University)
primary.item :languages, Language.model_name.human(count: 2), server_languages_path, { icon: 'flag' } primary.item :languages, Language.model_name.human(count: 2), server_languages_path, { icon: 'flag' } if can?(:read, Language)
end end
end end
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment