fix #1108 where completed todos with notes could not be rendered on the done page

This commit is contained in:
Reinier Balt 2011-02-14 20:22:59 +01:00
parent 117d7c9e50
commit 11d40fb48b
3 changed files with 39 additions and 18 deletions

View file

@ -1,22 +1,20 @@
<tr>
<% if done.completed_at %>
<td valign="top"><%= image_tag( "done.png", :width=>"16", :height=>"16", :border=>"0") %></td>
<td valign="top"><span class="grey"><%= format_date( done.completed_at ) %></span></td>
<td valign="top"><%= " " + sanitize(done.description) + " "%>
<% if done.completed_at %>
<td valign="top"><%= image_tag( "done.png", :width=>"16", :height=>"16", :border=>"0") %></td>
<td valign="top"><span class="grey"><%= format_date( done.completed_at ) %></span></td>
<td valign="top"><%= " " + sanitize(done.description) + " "%>
<% if done.project_id %>
<%= "(" + done.context['name'] + ", " + done.project['name'] + ")" %>
<% else %>
<%= "(" + done.context['name'] + ")" %>
<% if done.project_id %>
<%= "(" + done.context['name'] + ", " + done.project['name'] + ")" %>
<% else %>
<%= "(" + done.context['name'] + ")" %>
<% end %>
<% if done.due %>
<%= " - " + t('todos.was_due_on_date', :date => format_date( done.due )) %>
<% end %>
<%= collapsed_notes_image(done) if done.notes? %>
</td>
<% end %>
<% if done.due %>
<%= " - " + t('todos.was_due_on_date', :date => format_date( done.due )) %>
<% end %>
<% if done.notes? -%>
<%= render :partial => "todos/toggle_notes", :object => done %>
<% end -%>
</td>
<% end %>
</tr>