From 0d724228264d074719975fe2f1ae392bd607b737 Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Mon, 25 Aug 2014 17:22:14 +0200
Subject: [PATCH] Displaying the full event description in the ical feed
---
app/views/events/index.html.haml | 4 ++--
app/views/events/index.ics.erb | 4 ++--
app/views/events/show.ics.erb | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/views/events/index.html.haml b/app/views/events/index.html.haml
index 6c5546582..78807168c 100644
--- a/app/views/events/index.html.haml
+++ b/app/views/events/index.html.haml
@@ -22,7 +22,7 @@
- .sort_by { |e| e.city }.each do |event|
%li.event
= link_to event do
- %strong.city= event.city.gsub '-', ' '
+ %strong.city= event.city
= event.title
- else
@@ -41,7 +41,7 @@
- .sort_by { |e| e.city }.each do |event|
%li.event
= link_to event do
- %strong.city= event.city.gsub '-', ' '
+ %strong.city= event.city
= event.title
.formats
diff --git a/app/views/events/index.ics.erb b/app/views/events/index.ics.erb
index cf7237fc2..cd35c8657 100644
--- a/app/views/events/index.ics.erb
+++ b/app/views/events/index.ics.erb
@@ -12,8 +12,8 @@ DTEND;TZID=Europe/Paris:<%= event.end_time.strftime '%Y%m%dT%H%M%S' %>
UID:<%= event.id %>@agendadulibre.org
SUMMARY:<%= event.title %>
URL:<%= event_url event %>
-DESCRIPTION:Un événement de l'Agenda du Libre
-LOCATION:<%= event.address %> <%= event.city.gsub('-', ' ') %>
+DESCRIPTION:<%= strip_tags(event.description).gsub(/\r/, '').gsub /^/, ' ' %>
+LOCATION:<%= event.full_address %>
END:VEVENT
<% end %>
END:VCALENDAR
diff --git a/app/views/events/show.ics.erb b/app/views/events/show.ics.erb
index 4b6adcb9e..26c66fec3 100644
--- a/app/views/events/show.ics.erb
+++ b/app/views/events/show.ics.erb
@@ -12,7 +12,7 @@ DTEND;TZID=Europe/Paris:<%= event.end_time.strftime '%Y%m%dT%H%M%S' %>
UID:<%= event.id %>@agendadulibre.org
SUMMARY:<%= event.title %>
URL:<%= event_url event %>
-DESCRIPTION:Un événement de l'Agenda du Libre
-LOCATION:<%= event.address %> <%= event.city %>
+DESCRIPTION:<%= strip_tags(event.description).gsub(/\r/, '').gsub /^/, ' ' %>
+LOCATION:<%= event.full_address %>
END:VEVENT
END:VCALENDAR
--
GitLab