mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-16 23:30:12 +01:00
fix #1108 where completed todos with notes could not be rendered on the done page
This commit is contained in:
parent
117d7c9e50
commit
11d40fb48b
3 changed files with 39 additions and 18 deletions
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -34,6 +34,14 @@ Given /^I have ([0-9]+) completed todos$/ do |count|
|
|||
end
|
||||
end
|
||||
|
||||
Given /^I have ([0-9]+) completed todos with a note$/ do |count|
|
||||
context = @current_user.contexts.create!(:name => "context D")
|
||||
count.to_i.downto 1 do |i|
|
||||
todo = @current_user.todos.create!(:context_id => context.id, :description => "todo #{i}", :notes => "note #{i}")
|
||||
todo.complete!
|
||||
end
|
||||
end
|
||||
|
||||
Given /^"(.*)" depends on "(.*)"$/ do |successor_name, predecessor_name|
|
||||
successor = Todo.find_by_description(successor_name)
|
||||
predecessor = Todo.find_by_description(predecessor_name)
|
||||
|
|
|
|||
15
features/view_done.feature
Normal file
15
features/view_done.feature
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
Feature: Show done
|
||||
In order to see what I have completed
|
||||
As an user
|
||||
I want see my done todos
|
||||
|
||||
Background:
|
||||
Given the following user record
|
||||
| login | password | is_admin |
|
||||
| testuser | secret | false |
|
||||
|
||||
Scenario: Visit done page
|
||||
Given I have logged in as "testuser" with password "secret"
|
||||
And I have 1 completed todos with a note
|
||||
When I go to the done page
|
||||
Then I should see "Completed in the last 24 hours"
|
||||
Loading…
Add table
Add a link
Reference in a new issue