Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed possibility to set ical feed to none.

Browse source
This commit is contained in:
Martin Edenhofer 2015-09-25 11:48:14 +02:00
parent 8719c4350e
commit 0c7be7c346
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/views/generic/ical_feed.jst.eco
View file

@ -9,7 +9,7 @@
</label> </label>
<div class="u-inlineBlock u-positionOrigin"> <div class="u-inlineBlock u-positionOrigin">
<select class="form-control form-control--small js-list"> <select class="form-control form-control--small js-list">
<option>-</option> <option value="">-</option>
<% for url, name of @ical_feeds: %> <% for url, name of @ical_feeds: %>
<option value="<%= url %>" <% if @attribute.value is url: %>selected<%end%>><%- @T(name) %></option> <option value="<%= url %>" <% if @attribute.value is url: %>selected<%end%>><%- @T(name) %></option>
<% end %> <% end %>

5
app/models/calendar.rb
View file

@ -209,7 +209,10 @@ returns
def sync(without_save = nil) def sync(without_save = nil)
return if !ical_url return if !ical_url
begin begin
events = Calendar.parse(ical_url) events = {}
if ical_url && !ical_url.empty?
events = Calendar.parse(ical_url)
end
# sync with public_holidays # sync with public_holidays
if !public_holidays if !public_holidays