From 741bee5fbca2f6dfb73df1bd25e3edb8ae33a804 Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Wed, 21 Jan 2015 16:12:16 +0100
Subject: [PATCH] =?UTF-8?q?Optimisation=20rapide=20pour=20g=C3=A9n=C3=A9ra?=
=?UTF-8?q?tion=20fichier=20ical?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/events_controller.rb | 2 +-
app/views/events/index.ics.erb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 4fc6d62c8..1fa25c70f 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -15,7 +15,7 @@ class EventsController < ApplicationController
respond_to do |format|
format.html { render layout: 'iframe' if params[:iframe] }
format.rss { @events = @events.future }
- format.ics { @events = @events.last_year }
+ format.ics { @events = @events.last_year.includes :related_region }
format.xml { @events = @events.includes :related_region }
end
end
diff --git a/app/views/events/index.ics.erb b/app/views/events/index.ics.erb
index 7f0938dc6..c2c207c50 100644
--- a/app/views/events/index.ics.erb
+++ b/app/views/events/index.ics.erb
@@ -10,9 +10,9 @@ BEGIN:VEVENT
DTSTART:<%= event.start_time.strftime '%Y%m%dT%H%M%S' %>
DTEND:<%= event.end_time.strftime '%Y%m%dT%H%M%S' %>
UID:<%= event.id %>@agendadulibre.org
-SUMMARY:<%= event.title.gsub(/,/, '\,').gsub(/;/, '\;') %>
+SUMMARY:<%= event.title.gsub(',', '\,').gsub(';', '\;') %>
URL:<%= event_url event %>
-DESCRIPTION:<%= strip_tags(event.description).gsub(/'/, '’').gsub(/,/, '\,').gsub(/;/, '\;').gsub /^/, ' ' %>
+DESCRIPTION:<%= strip_tags(event.description).gsub(/'/, '’').gsub(',', '\,').gsub(';', '\;').gsub(/^/, ' ') %>
LOCATION:<%= event.full_address.gsub(/,/, '\,') %>
END:VEVENT
<% end %>
--
GitLab