Skip to content
Extraits de code Groupes Projets
Valider 369d7015 rédigé par Paulo Henrique de Lima Santana's avatar Paulo Henrique de Lima Santana
Parcourir les fichiers

Updates in functios to send emails to submitters and/or moderators

parent 9b2039f5
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -5,7 +5,7 @@ img.favicon
form#orga_search
right: 5%
width: 12em
width: 15em
position: absolute
font-size: larger
text-align: right
......@@ -23,6 +23,7 @@ form#orga_search
padding-left: 1.5em
padding-right: 1.2em
background-color: transparent
width: 14em
button.search
color: #258
......
......@@ -12,6 +12,18 @@ class EventMailer < ApplicationMailer
subject: event.title}"
end
# Send email to submitter too. Before, only moderators were receiving emails when an event was updated
def update(event)
@event = event
@current_user = User.find_by id: event.paper_trail.originator
mail 'In-Reply-To' =>
"<event-#{event.id}@#{ActionMailer::Base.default_url_options[:host]}>",
to: event.submitter,
subject: "#{t 'mail_prefix'}#{t 'event_mailer.update.subject',
subject: event.title}"
end
def accept(event)
@event = event
@current_user = User.find_by id: event.paper_trail.originator
......
# Send mails to check on organisations life cycle
class ModerationorgaMailer < ApplicationMailer
helper :events
# Subject can be set in your I18n file at config/locales/en.yml
# with the following lookup:
#
# en.orga_mailer.create.subject
#
def create(orga)
@orga = orga
mail 'Message-ID' =>
"<orga-#{orga.id}@#{ActionMailer::Base.default_url_options[:host]}>",
subject: "#{t 'mail_prefix'}#{t 'moderationorga_mailer.create.subject',
subject: orga.name}"
end
# Subject can be set in your I18n file at config/locales/en.yml
# with the following lookup:
#
# en.orga_mailer.update.subject
#
def update(orga)
@orga = orga
@current_user = User.find_by id: orga.paper_trail.originator
mail 'In-Reply-To' =>
"<orga-#{orga.id}@#{ActionMailer::Base.default_url_options[:host]}>",
subject: "#{t 'mail_prefix'}#{t 'moderationorga_mailer.update.subject',
subject: orga.name}"
end
# Subject can be set in your I18n file at config/locales/en.yml
# with the following lookup:
#
# en.orga_mailer.accept.subject
#
def accept(orga)
@orga = orga
@current_user = User.find_by id: orga.paper_trail.originator
mail 'In-Reply-To' =>
"<orga-#{orga.id}@#{ActionMailer::Base.default_url_options[:host]}>",
subject: "#{t 'mail_prefix'}#{t 'moderationorga_mailer.accept.subject',
subject: orga.name}"
end
# Subject can be set in your I18n file at config/locales/en.yml
# with the following lookup:
#
# en.orga_mailer.destroy.subject
#
def destroy(orga, reason = '')
@orga = orga
@current_user = User.find_by id: orga.paper_trail.originator
@reason = reason
mail 'In-Reply-To' =>
"<orga-#{orga.id}@#{ActionMailer::Base.default_url_options[:host]}>",
subject: "#{t 'mail_prefix'}#{t 'moderationorga_mailer.destroy.subject',
subject: orga.name}"
end
end
......@@ -39,6 +39,9 @@ class EventCallbacks
elsif ActionMailer::Base.default_url_options[:host]
# Send an update mail to moderators
ModerationMailer.update(event).deliver_now
# Included to Send an update mail to its author
EventMailer.update(event).deliver_now
end
end
......
......@@ -51,18 +51,26 @@ class Orga < ActiveRecord::Base
if moderated_changed?
OrgaMailer.accept(self).deliver_now!
# Send email to moderators when an orga is accepted
ModerationorgaMailer.accept(self).deliver_now!
else
OrgaMailer.update(self).deliver_now!
# Send email to moderators when an orga is updated
ModerationorgaMailer.update(self).deliver_now!
end
end
end
before_destroy do
OrgaMailer.destroy(self).deliver_now! unless submitter.blank?
# Send email to moderators when an orga is deleted
ModerationorgaMailer.destroy(self).deliver_now! unless submitter.blank?
end
def send_secret
OrgaMailer.create(self).deliver_now!
# Send email to moderators when an new orga is received
ModerationorgaMailer.create(self).deliver_now!
end
def name_as_tag
......
......@@ -19,6 +19,7 @@
= surround '<'.html_safe, '>'.html_safe do
= cancel_event_url e, secret: e.secret
\
= t '.reminder'
= render file: '/events/show'
\
= t '.signature'
= t '.body', subject: @event.title, author: @current_user || t('.submitter')
:ruby
new = render file: '/events/show'
former = @event
@event = @event.paper_trail.previous_version || @event
prev = render file: '/events/show'
@event = former
require 'differ/format/patch'
Differ.format = Differ::Format::Patch
= Differ.diff new, prev
\
= surround '<'.html_safe, '>'.html_safe do
= edit_event_url @event, secret: @event.secret
\
= t '.signature'
= t '.body', author: @current_user
\
= t '.reminder
= render file: '/events/show'
\
= t '.access'
......
......@@ -14,9 +14,6 @@
= Differ.diff new, prev
\
= surround '<'.html_safe, '>'.html_safe do
- if @current_user
= edit_moderation_url @event
- else
= edit_event_url @event, secret: @event.secret
= edit_moderation_url @event
\
= t '.signature'
......@@ -12,9 +12,8 @@
require 'differ/format/patch'
Differ.format = Differ::Format::Patch
= Differ.diff new, prev
= t '.access'
\
= surround '<'.html_safe, '>'.html_safe do
= orga_url @orga
= edit_orga_url @orga, secret: @orga.secret
\
= t '.signature'
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter