Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-07 17:58:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into rails4

Browse source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Reinier Balt 2013-06-21 10:20:36 +02:00
commit d64f6e003e
5 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/projects/_project.html.erb
View file

@ -2,7 +2,7 @@
@not_done = @not_done_todos.select {|t| t.project_id == project.id }
# invalidate the cache every day because of staleness or
# rendering of "due in x days" that change without touching updated at of the todo
cache [project, @source_view, current_user.date.strftime("%Y%m%d"), @tag_name] do
cache [project, source_view_key, current_user.date.strftime("%Y%m%d"), @tag_name] do
-%>
<%=
title = source_view_is(:project) ? t('projects.actions_in_project_title') : show_project_name(project)