diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 407fa37c01a7f571525a7108a7f279b200d6eca6..7d347091c8c6e43797cd2b179d82d4134141b3a8 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -100,10 +100,6 @@ class EventsController < ApplicationController
end
private
- def permitted_params
- params.require(:event).permit(:title, :start_time, :end_time, :description, :city, :locality, :url, :contact, :submitter, :tags)
- end
-
# Use callbacks to share common setup or constraints between actions.
def set_event
if (params[:secret].present?)
diff --git a/app/controllers/moderations_controller.rb b/app/controllers/moderations_controller.rb
index 894f0dba287c1b417738b53e9f4aba49d1f56383..e7472c3e08cd9557266ca8b60d4059fdb0fb9720 100644
--- a/app/controllers/moderations_controller.rb
+++ b/app/controllers/moderations_controller.rb
@@ -1,12 +1,12 @@
require 'differ'
-class ModerationsController < InheritedResources::Base
+class ModerationsController < ApplicationController
before_filter :authenticate_user!
before_action :set_event, only: [:show, :edit, :update, :destroy]
before_filter :set_mailer_host, only: [:update, :destroy]
def index
- @events = Event.unscoped.where moderated: 0
+ @events = Event.where moderated: 0
end
# PATCH/PUT /moderations/1
@@ -37,12 +37,12 @@ class ModerationsController < InheritedResources::Base
private
def permitted_params
- params.permit event: [:title, :start_time, :end_time, :description, :city, :locality, :url, :contact, :submitter, :tags]
+ params.require(:event).permit(:title, :start_time, :end_time, :description, :city, :locality, :url, :contact, :submitter, :tags)
end
# Use callbacks to share common setup or constraints between actions.
def set_event
- @event = Event.unscoped.find params[:id]
+ @event = Event.find params[:id]
@moderation = @event
end
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index e6389e537dbe486d341ad7e193c898ab9d8126fe..71844df2f8074a0d0f44941002e6e19e3e85c419 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -1,22 +1,46 @@
-class NotesController < InheritedResources::Base
- belongs_to :moderation
+class NotesController < ApplicationController
+ before_action :set_event, only: [:new, :create]
+ before_filter :set_mailer_host, only: [:create]
+
+ # GET /moderations/id/new
+ def new
+ @note = @moderation.notes.new
+ end
def create
- create! do |format|
- format.html {
- @note.author = current_user
- create!(notice: t(:added, scope: [:notes, :actions])) { moderations_url }
- }
+ @note = @moderation.notes.new(note_params)
+ @note.author = current_user
+
+ respond_to do |format|
+ if @note.save
+ if (params[:envoiParMail] == 'oui')
+ # Send an update mail to its author
+ NoteMailer.create(@note).deliver
+ end
+
+ format.html { redirect_to moderations_url, notice: t('.ok') }
+ format.json { render action: 'show', status: :created, location: @event }
+ else
+ format.html { render action: 'new' }
+ format.json { render json: @note.errors, status: :unprocessable_entity }
+ end
end
end
private
- def begin_of_association_chain
- @moderation = Event.unscoped.find params[:moderation_id]
- @event = @moderation
+ # Use callbacks to share common setup or constraints between actions.
+ def set_event
+ @event = Event.find params[:moderation_id]
+ @moderation = @event
+ end
+
+ # Never trust parameters from the scary internet, only allow the white list through.
+ def note_params
+ params.require(:note).permit :contents
end
- def permitted_params
- params.permit note: [:contents]
+ # Useful to manage absolute url in mails
+ def set_mailer_host
+ ActionMailer::Base.default_url_options[:host] = request.host_with_port
end
end
diff --git a/app/mailers/event_mailer.rb b/app/mailers/event_mailer.rb
index 26c6cb815eb2f06f274decea7bcf940faca19f5b..2ae26cb5f9a36d7c6b0af1b2a3d2658cb317bea6 100644
--- a/app/mailers/event_mailer.rb
+++ b/app/mailers/event_mailer.rb
@@ -3,6 +3,6 @@ class EventMailer < ActionMailer::Base
def create(event)
@event = event
- mail to: "to@example.org", subject: t('event_mailer.create.subject', subject: event.title)
+ mail to: event.contact, subject: t('event_mailer.create.subject', subject: event.title)
end
end
diff --git a/app/mailers/moderation_mailer.rb b/app/mailers/moderation_mailer.rb
index 7fab85b17f277908e51dd4e170161a9acbad5a8c..03fb968d734cd377a42b6fc926403ad2bc67d849 100644
--- a/app/mailers/moderation_mailer.rb
+++ b/app/mailers/moderation_mailer.rb
@@ -1,5 +1,6 @@
class ModerationMailer < ActionMailer::Base
default from: 'moderateurs@agendadulibre.org'
+ TO = 'moderateurs@agendadulibre.org'
# Subject can be set in your I18n file at config/locales/en.yml
# with the following lookup:
@@ -9,7 +10,7 @@ class ModerationMailer < ActionMailer::Base
def create(event)
@event = event
- mail to: "to@example.org", subject: t('moderation_mailer.create.subject', subject: event.title)
+ mail to: TO, subject: t('moderation_mailer.create.subject', subject: event.title)
end
# Subject can be set in your I18n file at config/locales/en.yml
@@ -21,7 +22,7 @@ class ModerationMailer < ActionMailer::Base
@event = event
@current_user = current_user
- mail to: "to@example.org", subject: t('moderation_mailer.update.subject', subject: event.title)
+ mail to: TO, subject: t('moderation_mailer.update.subject', subject: event.title)
end
# Subject can be set in your I18n file at config/locales/en.yml
@@ -33,6 +34,6 @@ class ModerationMailer < ActionMailer::Base
@event = event
@current_user = current_user
- mail to: "to@example.org", subject: t('moderation_mailer.moderate.subject', subject: event.title)
+ mail to: TO, subject: t('moderation_mailer.moderate.subject', subject: event.title)
end
end
diff --git a/app/mailers/note_mailer.rb b/app/mailers/note_mailer.rb
new file mode 100644
index 0000000000000000000000000000000000000000..e0d6364c075ec920b4a76749f5ac6b974682b4a2
--- /dev/null
+++ b/app/mailers/note_mailer.rb
@@ -0,0 +1,9 @@
+class NoteMailer < ActionMailer::Base
+ default from: 'moderateurs@agendadulibre.org'
+
+ def create(note)
+ @note = note
+
+ mail to: note.event.contact, subject: t('note_mailer.create.subject', subject: note.event.title)
+ end
+end
diff --git a/app/views/moderations/index.html.haml b/app/views/moderations/index.html.haml
index a295bc9c7fa40b8f289c55f4371c4a4c03b26f04..55b39cca6f5a56fae980306bab29fafb9ad83272 100644
--- a/app/views/moderations/index.html.haml
+++ b/app/views/moderations/index.html.haml
@@ -38,7 +38,7 @@
\-
= link_to t('refuse'), edit_moderation_path(event), class: 'fa-thumbs-down'
%br/
- = link_to t('.askInfos'), edit_moderation_path(event), class: 'fa-bullhorn'
+ = link_to t('.askInfos'), new_moderation_note_path(event, envoiParMail: :oui), class: 'fa-bullhorn'
%br/
= link_to t('.createNote'), new_moderation_note_path(event), class: 'fa-files-o'
diff --git a/app/views/note_mailer/create.text.haml b/app/views/note_mailer/create.text.haml
new file mode 100644
index 0000000000000000000000000000000000000000..e7715e04559911923ee6b18963507cc85306cee1
--- /dev/null
+++ b/app/views/note_mailer/create.text.haml
@@ -0,0 +1,13 @@
+=t '.title'
+\
+=t '.body', subject: @note.event.title, contents: @note.contents
+\
+= sanitize @note.contents.html_safe,
+ tags: %w(p br table tr td ul ol li a strong b em i img),
+ attributes: %w(href src width height)
+\
+=t '.edit_link'
+\
+= edit_moderation_url @note.event
+\
+=t '.signature'
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
index 6fc401c335f5315692a6ecdc6e5d010e95e5cdf1..cee45c487e110786fae6b5662fbcac21024f4554 100644
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@@ -1,4 +1,5 @@
= form_for [:moderation, @note] do |f|
+ = hidden_field_tag :envoiParMail, params[:envoiParMail]
- if @note.errors.any?
#error_explanation
%h2= "#{pluralize(@note.errors.count, "error")} prohibited this note from being saved:"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index efb866031d9770b22076067586deaded6e8aaa1c..e2a0884228724d4baead4b868ab67743daf8a931 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -178,8 +178,8 @@ fr:
new:
back: Modération
title: Ajout d'une note de modération
- actions:
- added: La note a bien été ajoutée, merci!
+ create:
+ ok: La note a bien été ajoutée, merci!
maps:
index:
title: Carte des évènements
@@ -220,3 +220,14 @@ fr:
title: Bonjour,
body: L'évènement a été modéré par %{author}
signature: "-- \nL'équipe de modération"
+ note_mailer:
+ create:
+ subject: "[Agenda du Libre] Demande d'informations sur l'évènement '%{subject}'"
+ title: Bonjour,
+ body: "Nous avons bien reçu votre proposition d'évènement '%{subject}',
+\net celui-ci a toute sa place dans l'Agenda du Libre. Néanmoins, avant
+\nd'être validé, nous avons besoin de quelques informations
+\ncomplémentaires sur cet évènement:"
+ edit_link: "Nous vous invitons à ajouter ces informations en éditant directement
+\nl'évènement à l'adresse suivante:"
+ signature: "Avec tous nos remerciements pour votre contribution,\n\n-- \nL'équipe des modérateurs de l'Agenda du Libre"
diff --git a/test/mailers/event_mailer_test.rb b/test/mailers/event_mailer_test.rb
index 0731444b5965a7de80ea3f13985d6385a7d65294..41cb15cecce877218217493d2b44a0db1a3ca92f 100644
--- a/test/mailers/event_mailer_test.rb
+++ b/test/mailers/event_mailer_test.rb
@@ -8,7 +8,7 @@ class EventMailerTest < ActionMailer::TestCase
test "create" do
mail = EventMailer.create(Event.last)
assert_match(/\[Agenda du Libre\] Votre évènement: .* est en attente de modération/, mail.subject)
- assert_equal ["to@example.org"], mail.to
+ assert_equal [Event.last.contact], mail.to
assert_equal ["moderateurs@agendadulibre.org"], mail.from
assert_match(/Bonjour.*/, mail.body.encoded)
end
diff --git a/test/mailers/moderation_mailer_test.rb b/test/mailers/moderation_mailer_test.rb
index 0459dc46d71a4bea363378eb66b7fecad404746b..2424c072b4b6e14909377b8a347c270d58399dc5 100644
--- a/test/mailers/moderation_mailer_test.rb
+++ b/test/mailers/moderation_mailer_test.rb
@@ -6,23 +6,23 @@ class ModerationMailerTest < ActionMailer::TestCase
end
test "create" do
- mail = ModerationMailer.create(Event.last)
+ mail = ModerationMailer.create(Event.unscoped.last)
assert_match(/\[Agenda du Libre\] Nouvel évènement à modérer: .*/, mail.subject)
- assert_equal ["to@example.org"], mail.to
+ assert_equal ["moderateurs@agendadulibre.org"], mail.to
assert_equal ["moderateurs@agendadulibre.org"], mail.from
end
test "update" do
- mail = ModerationMailer.update(Event.last, User.last)
+ mail = ModerationMailer.update(Event.unscoped.last, User.last)
assert_match(/\[Agenda du Libre\] Édition de l'évènement .*/, mail.subject)
- assert_equal ["to@example.org"], mail.to
+ assert_equal ["moderateurs@agendadulibre.org"], mail.to
assert_equal ["moderateurs@agendadulibre.org"], mail.from
end
test "moderate" do
- mail = ModerationMailer.moderate(Event.last, User.last)
+ mail = ModerationMailer.moderate(Event.unscoped.last, User.last)
assert_match(/\[Agenda du Libre\] Évènement .* modéré/, mail.subject)
- assert_equal ["to@example.org"], mail.to
+ assert_equal ["moderateurs@agendadulibre.org"], mail.to
assert_equal ["moderateurs@agendadulibre.org"], mail.from
end
end
diff --git a/test/mailers/note_mailer_test.rb b/test/mailers/note_mailer_test.rb
new file mode 100644
index 0000000000000000000000000000000000000000..8100284df36864149e37ad1396ff263c729a049e
--- /dev/null
+++ b/test/mailers/note_mailer_test.rb
@@ -0,0 +1,14 @@
+require 'test_helper'
+
+class NoteMailerTest < ActionMailer::TestCase
+ setup do
+ ActionMailer::Base.default_url_options[:host] = 'localhost:3000'
+ end
+
+ test "create" do
+ mail = NoteMailer.create(Note.last)
+ assert_match(/\[Agenda du Libre\] Demande d'informations sur l'évènement .*/, mail.subject)
+ assert_equal [Note.last.event.contact], mail.to
+ assert_equal ["moderateurs@agendadulibre.org"], mail.from
+ end
+end
diff --git a/test/mailers/previews/note_mailer_preview.rb b/test/mailers/previews/note_mailer_preview.rb
new file mode 100644
index 0000000000000000000000000000000000000000..70a91990cd9f18b5ade93497abc813bba44fd173
--- /dev/null
+++ b/test/mailers/previews/note_mailer_preview.rb
@@ -0,0 +1,8 @@
+# Preview all emails at http://localhost:3000/rails/mailers/note_mailer
+class NoteMailerPreview < ActionMailer::Preview
+ # Preview this email at http://localhost:3000/rails/mailers/note_mailer/create
+ def create
+ ActionMailer::Base.default_url_options[:host] = 'localhost:3000'
+ NoteMailer.create(Note.last)
+ end
+end