From 0c7be7c3461e0eff864fd38c9b4efb2182e4ae49 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Fri, 25 Sep 2015 11:48:14 +0200
Subject: [PATCH] Fixed possibility to set ical feed to none.

---
 app/assets/javascripts/app/views/generic/ical_feed.jst.eco | 2 +-
 app/models/calendar.rb                                     | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/app/views/generic/ical_feed.jst.eco b/app/assets/javascripts/app/views/generic/ical_feed.jst.eco
index 96e6fdecc..8a301df6e 100644
--- a/app/assets/javascripts/app/views/generic/ical_feed.jst.eco
+++ b/app/assets/javascripts/app/views/generic/ical_feed.jst.eco
@@ -9,7 +9,7 @@
   </label>
   <div class="u-inlineBlock u-positionOrigin">
     <select class="form-control form-control--small js-list">
-      <option>-</option>
+      <option value="">-</option>
       <% for url, name of @ical_feeds: %>
         <option value="<%= url %>" <% if @attribute.value is url: %>selected<%end%>><%- @T(name) %></option>
       <% end %>
diff --git a/app/models/calendar.rb b/app/models/calendar.rb
index 464e9af9d..d91064d99 100644
--- a/app/models/calendar.rb
+++ b/app/models/calendar.rb
@@ -209,7 +209,10 @@ returns
   def sync(without_save = nil)
     return if !ical_url
     begin
-      events = Calendar.parse(ical_url)
+      events = {}
+      if ical_url && !ical_url.empty?
+        events = Calendar.parse(ical_url)
+      end
 
       # sync with public_holidays
       if !public_holidays