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

view neuigekit meeting

Browse Source
This commit is contained in:
Andreas Stephanides
2015-04-29 16:07:54 +02:00
parent 8a32bff399
commit 9a9cee5768
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/meeting.rb
View File

@@ -46,6 +46,11 @@ class Meeting < ActiveRecord::Base
n.save
self.neuigkeit= n
end
end
def update_announcement
n=self.neuigkeit
n.title=self.text
n.save
end
def fix_calentry

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

@@ -7,7 +7,7 @@
<div class="media-body">
<div>
<small><%= ff_icon(neuigkeit.rubrik.icon) unless neuigkeit.rubrik.icon.nil? or neuigkeit.rubrik.icon.empty? %>&nbsp;<span><%= neuigkeit.rubrik.name %></span></small>
<% unless neuigkeit.has_calentries? %> <small class="pull-right"><% unless neuigkeit.try(:datum).try(:to_date).nil? %>
<% unless neuigkeit.has_calentries? || neuigkeit.has_meeting? %> <small class="pull-right"><% unless neuigkeit.try(:datum).try(:to_date).nil? %>
<%= I18n.t("neuigkeit.am") %>
<span datetime="<%= neuigkeit.try(:datum).to_formatted_s(:iso8601) unless neuigkeit.try(:datum).nil? %>"> <%= I18n.l(neuigkeit.try(:datum).try(:to_date))%> </span>
<% end %> </small> <% else %> <% end %>
@@ -22,6 +22,12 @@
<%= fa_icon("calendar 2x") %>
<%= neuigkeit.relevant_calentry.text %>
</div>
<% elsif neuigkeit.has_meeting? %>
<div class="pull-right" href="#">
<%= fa_icon("calendar 2x") %>
<%= neuigkeit.meeting.calentry.text %>
</div>
<% end %>
</div>