refacto: rename administration to super_admin
This commit is contained in:
parent
a88172eb01
commit
5562e65bf3
39 changed files with 180 additions and 175 deletions
|
@ -1,28 +0,0 @@
|
|||
class AdministrationsController < ApplicationController
|
||||
before_action :authenticate_administration!
|
||||
|
||||
def edit_otp
|
||||
end
|
||||
|
||||
def enable_otp
|
||||
current_administration.enable_otp!
|
||||
@qrcode = generate_qr_code
|
||||
sign_out :administration
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def authenticate_administration!
|
||||
if !administration_signed_in?
|
||||
redirect_to root_path
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def generate_qr_code
|
||||
issuer = 'DSManager'
|
||||
label = "#{issuer}:#{current_administration.email}"
|
||||
RQRCode::QRCode.new(current_administration.otp_provisioning_uri(label, issuer: issuer))
|
||||
end
|
||||
end
|
|
@ -142,7 +142,7 @@ class ApplicationController < ActionController::Base
|
|||
current_user,
|
||||
current_instructeur,
|
||||
current_administrateur,
|
||||
current_administration
|
||||
current_super_admin
|
||||
].compact.map { |role| role.class.name }
|
||||
|
||||
roles.any? ? roles.join(', ') : 'Guest'
|
||||
|
@ -180,11 +180,11 @@ class ApplicationController < ActionController::Base
|
|||
authorized_request =
|
||||
request.path_info == '/' ||
|
||||
request.path_info.start_with?('/manager') ||
|
||||
request.path_info.start_with?('/administrations')
|
||||
request.path_info.start_with?('/super_admins')
|
||||
|
||||
api_request = request.path_info.start_with?('/api/')
|
||||
|
||||
if administration_signed_in? || authorized_request
|
||||
if super_admin_signed_in? || authorized_request
|
||||
flash.now.alert = MAINTENANCE_MESSAGE
|
||||
elsif api_request
|
||||
render json: { error: MAINTENANCE_MESSAGE }.to_json, status: :service_unavailable
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
module Manager
|
||||
class AdministrateursController < Manager::ApplicationController
|
||||
def create
|
||||
administrateur = current_administration.invite_admin(create_administrateur_params[:email])
|
||||
administrateur = current_super_admin.invite_admin(create_administrateur_params[:email])
|
||||
|
||||
if administrateur.errors.empty?
|
||||
flash.notice = "Administrateur créé"
|
||||
|
@ -14,7 +14,7 @@ module Manager
|
|||
end
|
||||
|
||||
def reinvite
|
||||
Administrateur.find_inactive_by_id(params[:id]).user.invite_administrateur!(current_administration.id)
|
||||
Administrateur.find_inactive_by_id(params[:id]).user.invite_administrateur!(current_super_admin.id)
|
||||
flash.notice = "Invitation renvoyée"
|
||||
redirect_to manager_administrateur_path(params[:id])
|
||||
end
|
||||
|
@ -24,7 +24,7 @@ module Manager
|
|||
|
||||
administrateur.delete_and_transfer_services
|
||||
|
||||
logger.info("L'administrateur #{administrateur.id} est supprimé par #{current_administration.id}")
|
||||
logger.info("L'administrateur #{administrateur.id} est supprimé par #{current_super_admin.id}")
|
||||
flash[:notice] = "L'administrateur #{administrateur.id} est supprimé"
|
||||
|
||||
redirect_to manager_administrateurs_path
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
module Manager
|
||||
class ApplicationController < Administrate::ApplicationController
|
||||
before_action :authenticate_administration!
|
||||
before_action :authenticate_super_admin!
|
||||
before_action :default_params
|
||||
|
||||
def default_params
|
||||
|
@ -12,13 +12,13 @@ module Manager
|
|||
|
||||
protected
|
||||
|
||||
def authenticate_administration!
|
||||
if administration_signed_in? && current_administration.otp_required_for_login?
|
||||
def authenticate_super_admin!
|
||||
if super_admin_signed_in? && current_super_admin.otp_required_for_login?
|
||||
super
|
||||
elsif administration_signed_in?
|
||||
redirect_to edit_administration_otp_path
|
||||
elsif super_admin_signed_in?
|
||||
redirect_to edit_super_admin_otp_path
|
||||
else
|
||||
redirect_to new_administration_session_path
|
||||
redirect_to new_super_admin_session_path
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -5,12 +5,12 @@ module Manager
|
|||
end
|
||||
|
||||
def create_administrateur
|
||||
administrateur = current_administration.invite_admin(create_administrateur_params[:email])
|
||||
administrateur = current_super_admin.invite_admin(create_administrateur_params[:email])
|
||||
|
||||
if administrateur.errors.empty?
|
||||
PipedriveAcceptsDealsJob.perform_later(
|
||||
create_administrateur_params[:person_id],
|
||||
current_administration.id,
|
||||
current_super_admin.id,
|
||||
create_administrateur_params[:stage_id]
|
||||
)
|
||||
|
||||
|
@ -26,7 +26,7 @@ module Manager
|
|||
def refuse_administrateur
|
||||
PipedriveRefusesDealsJob.perform_later(
|
||||
refuse_administrateur_params[:person_id],
|
||||
current_administration.id
|
||||
current_super_admin.id
|
||||
)
|
||||
|
||||
AdministrationMailer
|
||||
|
|
|
@ -22,9 +22,9 @@ module Manager
|
|||
|
||||
def discard
|
||||
dossier = Dossier.find(params[:id])
|
||||
dossier.discard_and_keep_track!(current_administration, :manager_request)
|
||||
dossier.discard_and_keep_track!(current_super_admin, :manager_request)
|
||||
|
||||
logger.info("Le dossier #{dossier.id} est supprimé par #{current_administration.email}")
|
||||
logger.info("Le dossier #{dossier.id} est supprimé par #{current_super_admin.email}")
|
||||
flash[:notice] = "Le dossier #{dossier.id} a été supprimé."
|
||||
|
||||
redirect_to manager_dossier_path(dossier)
|
||||
|
@ -32,7 +32,7 @@ module Manager
|
|||
|
||||
def restore
|
||||
dossier = Dossier.with_discarded.find(params[:id])
|
||||
dossier.restore(current_administration)
|
||||
dossier.restore(current_super_admin)
|
||||
|
||||
flash[:notice] = "Le dossier #{dossier.id} a été restauré."
|
||||
|
||||
|
@ -41,9 +41,9 @@ module Manager
|
|||
|
||||
def repasser_en_instruction
|
||||
dossier = Dossier.find(params[:id])
|
||||
dossier.repasser_en_instruction(current_administration)
|
||||
dossier.repasser_en_instruction(current_super_admin)
|
||||
|
||||
logger.info("Le dossier #{dossier.id} est repassé en instruction par #{current_administration.email}")
|
||||
logger.info("Le dossier #{dossier.id} est repassé en instruction par #{current_super_admin.email}")
|
||||
flash[:notice] = "Le dossier #{dossier.id} est repassé en instruction."
|
||||
|
||||
redirect_to manager_dossier_path(dossier)
|
||||
|
|
|
@ -15,7 +15,7 @@ module Manager
|
|||
end
|
||||
instructeur.destroy!
|
||||
|
||||
logger.info("L'instructeur #{instructeur.id} est supprimé par #{current_administration.id}")
|
||||
logger.info("L'instructeur #{instructeur.id} est supprimé par #{current_super_admin.id}")
|
||||
flash[:notice] = "L'instructeur #{instructeur.id} est supprimé"
|
||||
|
||||
redirect_to manager_instructeurs_path
|
||||
|
|
|
@ -23,16 +23,16 @@ module Manager
|
|||
end
|
||||
|
||||
def discard
|
||||
procedure.discard_and_keep_track!(current_administration)
|
||||
procedure.discard_and_keep_track!(current_super_admin)
|
||||
|
||||
logger.info("La démarche #{procedure.id} est supprimée par #{current_administration.email}")
|
||||
logger.info("La démarche #{procedure.id} est supprimée par #{current_super_admin.email}")
|
||||
flash[:notice] = "La démarche #{procedure.id} a été supprimée."
|
||||
|
||||
redirect_to manager_procedure_path(procedure)
|
||||
end
|
||||
|
||||
def restore
|
||||
procedure.restore(current_administration)
|
||||
procedure.restore(current_super_admin)
|
||||
|
||||
flash[:notice] = "La démarche #{procedure.id} a été restauré."
|
||||
|
||||
|
|
|
@ -39,9 +39,9 @@ module Manager
|
|||
if !user.can_be_deleted?
|
||||
fail "Impossible de supprimer cet utilisateur. Il a des dossiers en instruction ou il est administrateur."
|
||||
end
|
||||
user.delete_and_keep_track_dossiers(current_administration)
|
||||
user.delete_and_keep_track_dossiers(current_super_admin)
|
||||
|
||||
logger.info("L'utilisateur #{user.id} est supprimé par #{current_administration.id}")
|
||||
logger.info("L'utilisateur #{user.id} est supprimé par #{current_super_admin.id}")
|
||||
flash[:notice] = "L'utilisateur #{user.id} est supprimé"
|
||||
|
||||
redirect_to manager_users_path
|
||||
|
|
|
@ -8,7 +8,7 @@ class RootController < ApplicationController
|
|||
return redirect_to instructeur_procedures_path
|
||||
elsif user_signed_in?
|
||||
return redirect_to dossiers_path
|
||||
elsif administration_signed_in?
|
||||
elsif super_admin_signed_in?
|
||||
return redirect_to manager_root_path
|
||||
end
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
class StatsController < ApplicationController
|
||||
before_action :authenticate_administration!, only: [:download]
|
||||
before_action :authenticate_super_admin!, only: [:download]
|
||||
|
||||
MEAN_NUMBER_OF_CHAMPS_IN_A_FORM = 24.0
|
||||
|
||||
|
@ -34,7 +34,7 @@ class StatsController < ApplicationController
|
|||
@dossiers_cumulative = stat.dossiers_cumulative
|
||||
@dossiers_in_the_last_4_months = stat.dossiers_in_the_last_4_months
|
||||
|
||||
if administration_signed_in?
|
||||
if super_admin_signed_in?
|
||||
@dossier_instruction_mean_time = Rails.cache.fetch("dossier_instruction_mean_time", expires_in: 1.day) do
|
||||
dossier_instruction_mean_time(dossiers)
|
||||
end
|
||||
|
@ -201,7 +201,7 @@ class StatsController < ApplicationController
|
|||
end
|
||||
|
||||
def max_date
|
||||
if administration_signed_in?
|
||||
if super_admin_signed_in?
|
||||
Time.zone.now
|
||||
else
|
||||
Time.zone.now.beginning_of_month - 1.second
|
||||
|
|
28
app/controllers/super_admins_controller.rb
Normal file
28
app/controllers/super_admins_controller.rb
Normal file
|
@ -0,0 +1,28 @@
|
|||
class SuperAdminsController < ApplicationController
|
||||
before_action :authenticate_super_admin!
|
||||
|
||||
def edit_otp
|
||||
end
|
||||
|
||||
def enable_otp
|
||||
current_super_admin.enable_otp!
|
||||
@qrcode = generate_qr_code
|
||||
sign_out :super_admin
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def authenticate_super_admin!
|
||||
if !super_admin_signed_in?
|
||||
redirect_to root_path
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def generate_qr_code
|
||||
issuer = 'DSManager'
|
||||
label = "#{issuer}:#{current_super_admin.email}"
|
||||
RQRCode::QRCode.new(current_super_admin.otp_provisioning_uri(label, issuer: issuer))
|
||||
end
|
||||
end
|
Loading…
Add table
Add a link
Reference in a new issue