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

object nil? in calendar view

Browse Source
This commit is contained in:
Andreas Stephanides
2013-11-27 15:55:13 +01:00
parent 3ac0ef675b
commit 14fe56d59a
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/calendars/show.html.erb
View File

@@ -24,7 +24,7 @@
</div>
<div class="row-fluid">
<%= calendar @calendar.calentries do |entry| %>
<div><%= link_to entry.name.to_s, polymorphic_path(entry.object) %></div>
<div><%= link_to entry.name.to_s, polymorphic_path(entry.try(:object)) unless entry.object.nil? %></div>
<% end %>
</div>
<div class="row-fluid">

15
app/views/calentries/show.html.erb
View File

@@ -1,13 +1,24 @@
<p id="notice"><%= notice %></p>
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<div class="span12">
<b>
<%= @calentry.summary %>
</b>
</div>
</div>
<div><%= unless @calentry.object.nil?
link_to @calentry.name.to_s, polymorphic_path(@calentry.object)
else
@calentry.name.to_s
end
%></div>
<div><%= link_to @calentry.name.to_s, polymorphic_path(@calentry.object)
%></div>
<div class="row-fluid">
<div class="span9">
<%= I18n.l @calentry.start %>
@@ -21,5 +32,5 @@
<div class="row-fluid">
<div class="span12">
<%= link_to 'Edit', edit_calentry_path(@calentry) %> |
<%= link_to 'Back', calentries_path %>
<%= link_to 'Back', calendar_path(@calentry.calendar) %>
</div></div></div>