diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index e82dbbe4..da0d2cb3 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb @@ -81,7 +81,7 @@ class EventsController < ApplicationController respond_to do |format| if @event.update event_params # Send an update mail to moderators - ModerationMailer.update(@moderation, nil).deliver + ModerationMailer.update(@event, nil).deliver format.html { redirect_to :root, notice: t('.ok') } format.json { head :no_content } diff --git a/app/views/moderation_mailer/update.text.haml b/app/views/moderation_mailer/update.text.haml index 1ba5a915..899f3b3c 100644 --- a/app/views/moderation_mailer/update.text.haml +++ b/app/views/moderation_mailer/update.text.haml @@ -8,6 +8,9 @@ .gsub(/\[32m/, '') | .gsub(/\[0m/, '') | \ -= edit_moderation_url @event +- if @current_user + = edit_moderation_url @event +- else + = edit_event_url @event, secret: @event.secret \ =t '.signature' diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 13912534..f4918857 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -276,7 +276,7 @@ fr: accept: subject: "[Agenda du Libre] Évènement '%{subject}' modéré" title: Bonjour, - body: L'évènement a été modéré par %{author} + body: L'évènement a été modéré par %{author}. signature: "-- \nL'équipe de modération" destroy: subject: "[Agenda du Libre] Évènement '%{subject}' refusé" diff --git a/test/mailers/previews/moderation_mailer_preview.rb b/test/mailers/previews/moderation_mailer_preview.rb index 41f8a0fd..67591ee0 100644 --- a/test/mailers/previews/moderation_mailer_preview.rb +++ b/test/mailers/previews/moderation_mailer_preview.rb @@ -14,7 +14,7 @@ class ModerationMailerPreview < ActionMailer::Preview event = Event.last event.description = event.description + ' hello world' - ModerationMailer.update event, User.last + ModerationMailer.update event, nil end # Preview this email at http://localhost:3000/rails/mailers/moderation_mailer/accept