bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/fetsite/fetsite

Browse Source
This commit is contained in:
Andreas Stephanides
2015-03-30 11:24:03 +02:00
parent 32f9e010f8 69c9e346d7
commit 4cd5bffff2
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/meeting.rb
View File

@@ -42,6 +42,7 @@ class Meeting < ActiveRecord::Base
n.text ="Agenda im Anhang" n.text ="Agenda im Anhang"
n.rubrik = self.meetingtyp.rubrik n.rubrik = self.meetingtyp.rubrik
n.author=user n.author=user
n.datum=Date.today
n.save n.save
self.neuigkeit= n self.neuigkeit= n
end end

2
app/views/neuigkeiten/_compact.html.erb
View File

@@ -1,5 +1,5 @@
<div class="media"> <div class="media">
<div class="pull-left" href="#"> <div class="pull-left">
<p><br> <p><br>
<% unless neuigkeit.picture_robust.url.nil? %><%= image_tag neuigkeit.picture_robust.thumb.url %> <% unless neuigkeit.picture_robust.url.nil? %><%= image_tag neuigkeit.picture_robust.thumb.url %>
<% end %> </p> <% end %> </p>

4
app/views/rubriken/show.html.erb
View File

@@ -46,11 +46,11 @@
</div> </div>
</div> </div>
<div class="span3"> <div class="span3">
<% 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 %> <% 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 %> <%= render 'calendars/calentries', :object=>@calentries %>
<% end %> <% end %>
<% end %>
<%= link_to "ics-format", calendar_path(@rubrik.calendar,:format=>:ics) %> <%= link_to "ics-format", calendar_path(@rubrik.calendar,:format=>:ics) %>
</div> </div>