DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9991 from mfo/US/fix-attestation-template-revision-preloader

Browse source 
perf(mail_template/attestation): preload procedure revisions
This commit is contained in:
mfo 2024-02-14 08:58:16 +00:00 committed by GitHub
commit 3237ea8e9f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/administrateurs/administrateur_controller.rb
View file

@ -26,6 +26,15 @@ module Administrateurs
@procedure.reset!
end
def preload_revisions
ProcedureRevisionPreloader.new(@procedure.revisions).all
@procedure.association(:draft_revision).target = @procedure.revisions.find { _1.id == @procedure.draft_revision.id }
if @procedure.published_revision
@procedure.association(:published_revision).target = @procedure.revisions.find { _1.id == @procedure.published_revision.id }
end
end
def ensure_not_super_admin!
if administrateur_as_manager?
redirect_back fallback_location: root_url, alert: "Interdit aux super admins", status: 403

1
app/controllers/administrateurs/attestation_templates_controller.rb
View file

@ -3,6 +3,7 @@ module Administrateurs
include UninterlacePngConcern
before_action :retrieve_procedure
before_action :preload_revisions
def show
redirect_to edit_admin_procedure_attestation_template_path(@procedure)

26
app/controllers/administrateurs/mail_templates_controller.rb
View file

@ -1,6 +1,8 @@
module Administrateurs
class MailTemplatesController < AdministrateurController
include ActionView::Helpers::SanitizeHelper
before_action :retrieve_procedure
before_action :preload_revisions
def index
@mail_templates = mail_templates
@ -15,7 +17,7 @@ module Administrateurs
end
def show
redirect_to edit_admin_procedure_mail_template_path(procedure.id, params[:id])
redirect_to edit_admin_procedure_mail_template_path(@procedure.id, params[:id])
end
def update
@ -35,11 +37,11 @@ module Administrateurs
def preview
mail_template = find_mail_template_by_slug(params[:id])
dossier = procedure.active_revision.dossier_for_preview(current_user)
dossier = @procedure.active_revision.dossier_for_preview(current_user)
@dossier = dossier
@logo_url = procedure.logo_url
@service = procedure.service
@logo_url = @procedure.logo_url
@service = @procedure.service
@rendered_template = sanitize(mail_template.body_for_dossier(dossier), scrubber: Sanitizers::MailScrubber.new)
@actions = mail_template.actions_for_dossier(dossier)
@ -48,18 +50,14 @@ module Administrateurs
private
def procedure
@procedure ||= current_administrateur.procedures.find(params[:procedure_id])
end
def mail_templates
[
procedure.passer_en_construction_email_template,
procedure.passer_en_instruction_email_template,
procedure.accepter_email_template,
procedure.refuser_email_template,
procedure.classer_sans_suite_email_template,
procedure.repasser_en_instruction_email_template
@procedure.passer_en_construction_email_template,
@procedure.passer_en_instruction_email_template,
@procedure.accepter_email_template,
@procedure.refuser_email_template,
@procedure.classer_sans_suite_email_template,
@procedure.repasser_en_instruction_email_template
]
end