From 5dd021d385d8bf38e28e3329c30d86a65e2da89a Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Mon, 30 Mar 2015 11:19:19 +0200 Subject: [PATCH 1/3] =?UTF-8?q?#245=20fixed=20-=20direkt=20ver=C3=B6ffentl?= =?UTF-8?q?ichung=20von=20Ank=C3=BCndigungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/meeting.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/meeting.rb b/app/models/meeting.rb index fffb525..2d82dff 100644 --- a/app/models/meeting.rb +++ b/app/models/meeting.rb @@ -42,6 +42,7 @@ class Meeting < ActiveRecord::Base n.text ="Agenda im Anhang" n.rubrik = self.meetingtyp.rubrik n.author=user + n.datum=Date.today n.save self.neuigkeit= n end From c5fced7176bacbd73e98534c28a89fbe5bcf773d Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Mon, 30 Mar 2015 11:19:39 +0200 Subject: [PATCH 2/3] fix illegal href in div --- app/views/neuigkeiten/_compact.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/neuigkeiten/_compact.html.erb b/app/views/neuigkeiten/_compact.html.erb index b6c7336..c149458 100644 --- a/app/views/neuigkeiten/_compact.html.erb +++ b/app/views/neuigkeiten/_compact.html.erb @@ -1,5 +1,5 @@
-
+


<% unless neuigkeit.picture_robust.url.nil? %><%= image_tag neuigkeit.picture_robust.thumb.url %> <% end %>

From fe65602b7e4a159820147a9cec119ee8fed23d47 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Mon, 30 Mar 2015 11:19:50 +0200 Subject: [PATCH 3/3] fix calentries empty? --- app/views/rubriken/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/rubriken/show.html.erb b/app/views/rubriken/show.html.erb index 3b1fd87..15078a0 100755 --- a/app/views/rubriken/show.html.erb +++ b/app/views/rubriken/show.html.erb @@ -46,11 +46,11 @@
- +<% unless @calentries.nil? || @calentries.empty? %> <% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+I18n.locale.to_s+params[:month].to_s+params[:year].to_s) do %> <%= render 'calendars/calentries', :object=>@calentries %> <% end %> - +<% end %> <%= link_to "ics-format", calendar_path(@rubrik.calendar,:format=>:ics) %>