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 diff --git a/app/views/neuigkeiten/_compact.html.erb b/app/views/neuigkeiten/_compact.html.erb index 95f7921..e5fcac7 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 %>

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) %>