view neuigekit meeting
This commit is contained in:
@@ -46,6 +46,11 @@ class Meeting < ActiveRecord::Base
|
|||||||
n.save
|
n.save
|
||||||
self.neuigkeit= n
|
self.neuigkeit= n
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
def update_announcement
|
||||||
|
n=self.neuigkeit
|
||||||
|
n.title=self.text
|
||||||
|
n.save
|
||||||
|
|
||||||
end
|
end
|
||||||
def fix_calentry
|
def fix_calentry
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
<div class="media-body">
|
<div class="media-body">
|
||||||
<div>
|
<div>
|
||||||
<small><%= ff_icon(neuigkeit.rubrik.icon) unless neuigkeit.rubrik.icon.nil? or neuigkeit.rubrik.icon.empty? %> <span><%= neuigkeit.rubrik.name %></span></small>
|
<small><%= ff_icon(neuigkeit.rubrik.icon) unless neuigkeit.rubrik.icon.nil? or neuigkeit.rubrik.icon.empty? %> <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") %>
|
<%= 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>
|
<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 %>
|
<% end %> </small> <% else %> <% end %>
|
||||||
@@ -22,6 +22,12 @@
|
|||||||
<%= fa_icon("calendar 2x") %>
|
<%= fa_icon("calendar 2x") %>
|
||||||
<%= neuigkeit.relevant_calentry.text %>
|
<%= neuigkeit.relevant_calentry.text %>
|
||||||
</div>
|
</div>
|
||||||
|
<% elsif neuigkeit.has_meeting? %>
|
||||||
|
<div class="pull-right" href="#">
|
||||||
|
<%= fa_icon("calendar 2x") %>
|
||||||
|
<%= neuigkeit.meeting.calentry.text %>
|
||||||
|
</div>
|
||||||
|
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user