Bug dans l'envoi de mail suite à modificaton d'événement par le soumetteur

This commit is contained in:
echarp 2014-07-01 22:46:53 +02:00
parent 9c2f414531
commit 12c621df2b
4 changed files with 7 additions and 4 deletions

View File

@ -81,7 +81,7 @@ class EventsController < ApplicationController
respond_to do |format| respond_to do |format|
if @event.update event_params if @event.update event_params
# Send an update mail to moderators # 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.html { redirect_to :root, notice: t('.ok') }
format.json { head :no_content } format.json { head :no_content }

View File

@ -8,6 +8,9 @@
.gsub(/\[32m/, '') | .gsub(/\[32m/, '') |
.gsub(/\[0m/, '') | .gsub(/\[0m/, '') |
\ \
= edit_moderation_url @event - if @current_user
= edit_moderation_url @event
- else
= edit_event_url @event, secret: @event.secret
\ \
=t '.signature' =t '.signature'

View File

@ -276,7 +276,7 @@ fr:
accept: accept:
subject: "[Agenda du Libre] Évènement '%{subject}' modéré" subject: "[Agenda du Libre] Évènement '%{subject}' modéré"
title: Bonjour, 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" signature: "-- \nL'équipe de modération"
destroy: destroy:
subject: "[Agenda du Libre] Évènement '%{subject}' refusé" subject: "[Agenda du Libre] Évènement '%{subject}' refusé"

View File

@ -14,7 +14,7 @@ class ModerationMailerPreview < ActionMailer::Preview
event = Event.last event = Event.last
event.description = event.description + ' event.description = event.description + '
hello world' hello world'
ModerationMailer.update event, User.last ModerationMailer.update event, nil
end end
# Preview this email at http://localhost:3000/rails/mailers/moderation_mailer/accept # Preview this email at http://localhost:3000/rails/mailers/moderation_mailer/accept