fix(attestation_v2.signature): forward signature url to attestation_template_v2/show.html

This commit is contained in:
mfo 2025-01-03 10:41:30 +01:00
parent a40d6e9c8a
commit ee6f9ee77e
No known key found for this signature in database
GPG key ID: 7CE3E1F5B794A8EC
3 changed files with 6 additions and 13 deletions

View file

@ -10,7 +10,8 @@ module Administrateurs
def show
preview_dossier = @procedure.dossier_for_preview(current_user)
@body = @attestation_template.render_attributes_for(dossier: preview_dossier).fetch(:body)
@body = attributes.fetch(:body)
@signature = attributes.fetch(:signature)
respond_to do |format|
format.html do

View file

@ -111,12 +111,6 @@ class AttestationTemplate < ApplicationRecord
end
end
def signature_url
if signature.attached?
Rails.application.routes.url_helpers.url_for(signature)
end
end
def render_attributes_for(params = {})
groupe_instructeur = params[:groupe_instructeur]
groupe_instructeur ||= params[:dossier]&.groupe_instructeur
@ -176,13 +170,11 @@ class AttestationTemplate < ApplicationRecord
substitutions = tags_substitutions(used_tags, dossier, escape: false)
body = tiptap.to_html(json, substitutions)
attributes.merge(
body:
)
attributes.merge(body:).merge(base_attributes)
else
attributes.merge(
body: params.fetch(:body) { tiptap.to_html(json) }
)
).merge(base_attributes)
end
end

View file

@ -26,6 +26,6 @@
.main
= sanitize(@body, attributes: %w[class style], tags: Rails.configuration.action_view.sanitized_allowed_tags + %w[header])
- if @attestation_template.signature.present?
- if @signature&.attached?
.signature
= image_tag(@attestation_template.signature_url)
= image_tag(@signature)