correctif(dolist): utilise des liens vers les logos des procedures pl…

…utôt que des attachements.inlined
demarches-simplifiees · Jul 27, 2023 · 425e8e4 · 425e8e4
1 parent 9571981
commit 425e8e4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -59,6 +59,7 @@ gem 'lograge'
 gem 'logstash-event'
 gem 'mailjet', require: false
 gem 'matrix' # needed by prawn and not default in ruby 3.1
+gem 'mini_magick'
 gem 'net-imap', require: false # See https://github.com/mikel/mail/pull/1439
 gem 'net-pop', require: false # same
 gem 'net-smtp', require: false # same

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -876,6 +876,7 @@ DEPENDENCIES
   matrix
   memory_profiler
   mina
+  mini_magick
   net-imap
   net-pop
   net-smtp

diff --git a/app/mailers/dossier_mailer.rb b/app/mailers/dossier_mailer.rb
@@ -8,11 +8,12 @@ class DossierMailer < ApplicationMailer
   default from: NO_REPLY_EMAIL
   after_action :prevent_perform_deliveries, only: [:notify_new_draft, :notify_new_answer, :notify_pending_correction]
 
+
   def notify_new_draft
     @dossier = params[:dossier]
     I18n.with_locale(@dossier.user_locale) do
       @service = @dossier.procedure.service
-      @logo_url = attach_logo(@dossier.procedure)
+      @logo_url = @dossier.procedure.logo_url
       @subject = default_i18n_subject(libelle_demarche: @dossier.procedure.libelle)
 
       mail(to: @dossier.user_email_for(:notification), subject: @subject) do |format|
@@ -27,7 +28,7 @@ def notify_new_answer
     I18n.with_locale(dossier.user_locale) do
       @dossier = dossier
       @service = dossier.procedure.service
-      @logo_url = attach_logo(dossier.procedure)
+      @logo_url = @dossier.procedure.logo_url
       @body = commentaire.body
       @subject = default_i18n_subject(dossier_id: dossier.id, libelle_demarche: dossier.procedure.libelle)
 
@@ -52,7 +53,7 @@ def notify_pending_correction
     I18n.with_locale(dossier.user_locale) do
       @dossier = dossier
       @service = dossier.procedure.service
-      @logo_url = attach_logo(dossier.procedure)
+      @logo_url = @dossier.procedure.logo_url
       @correction = commentaire.dossier_correction
 
       @subject = default_i18n_subject(dossier_id: dossier.id, libelle_demarche: dossier.procedure.libelle)
@@ -85,7 +86,7 @@ def notify_revert_to_instruction(dossier)
     I18n.with_locale(dossier.user_locale) do
       @dossier = dossier
       @service = dossier.procedure.service
-      @logo_url = attach_logo(dossier.procedure)
+      @logo_url = @dossier.procedure.logo_url
       @subject = default_i18n_subject(dossier_id: dossier.id, libelle_demarche: dossier.procedure.libelle)
 
       mail(to: dossier.user_email_for(:notification), subject: @subject) do |format|

diff --git a/app/models/procedure.rb b/app/models/procedure.rb
@@ -702,7 +702,7 @@ def missing_steps
 
   def logo_url
     if logo.attached?
-      Rails.application.routes.url_helpers.url_for(logo)
+      Rails.application.routes.url_helpers.url_for(logo.variant(resize_to_limit: [150, 150]).processed)
     else
       ActionController::Base.helpers.image_url(PROCEDURE_DEFAULT_LOGO_SRC)
     end

diff --git a/config/initializers/new_framework_defaults_7_0.rb b/config/initializers/new_framework_defaults_7_0.rb
@@ -73,7 +73,7 @@
 # generate variants to use image processing macros and ruby-vips
 # operations. See the upgrading guide for detail on the changes required.
 # The `:mini_magick` option is not deprecated; it's fine to keep using it.
-Rails.application.config.active_storage.variant_processor = :vips
+Rails.application.config.active_storage.variant_processor = :mini_magick
 
 # Enable parameter wrapping for JSON.
 # Previously this was set in an initializer. It's fine to keep using that initializer if you've customized it.