Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-16 15:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1865 from C-Otto/tracks-1840

Browse source 
Show links to context/project also for completed actions
This commit is contained in:
Matt Rogers 2015-08-07 21:06:27 -04:00
commit 5342877caf
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/helpers/todos_helper.rb
View file

@ -305,17 +305,16 @@ module TodosHelper
end
def project_and_context_links(todo, parent_container_type, opts = {})
str = ''
links = ''
if todo.completed?
links = []
links << todo.context.name unless opts[:suppress_context]
links << todo.project.name unless opts[:suppress_project] || todo.project.nil?
str = "(#{links.join(", ")})" unless links.empty?
links << item_link_to_context( todo ) unless opts[:suppress_context]
links << item_link_to_project( todo ) unless opts[:suppress_project] || todo.project.nil?
else
str << item_link_to_context( todo ) if include_context_link(todo, parent_container_type)
str << item_link_to_project( todo ) if include_project_link(todo, parent_container_type)
links << item_link_to_context( todo ) if include_context_link(todo, parent_container_type)
links << item_link_to_project( todo ) if include_project_link(todo, parent_container_type)
end
return str.html_safe
links.html_safe
end
def include_context_link(todo, parent_container_type)