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

small refactorings

Browse source 
fix passing params in use of _collection
This commit is contained in:
Reinier Balt 2013-05-03 21:54:03 +02:00
parent f891ee86fe
commit 5cfa115cdc
8 changed files with 54 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/views/contexts/_context.html.erb
View file

@ -4,7 +4,6 @@
# rendering of "due in x days" that change without touching updated at of the todo
cache [context, @source_view, current_user.date.strftime("%Y%m%d"), @tag_name] do
%>
<%=
render :partial => 'todos/collection',
:object => @not_done,
@ -13,8 +12,8 @@ cache [context, @source_view, current_user.date.strftime("%Y%m%d"), @tag_name] d
:collapsible => settings[:collapsible],
:container_name => 'context',
:title => show_context_name(context),
:show_empty_containers => settings[:show_empty_containers]
:show_empty_containers => settings[:show_empty_containers],
:parent_container_type => settings[:parent_container_type]
}}
%>
<% end %>
<% end %>

2
app/views/contexts/show.html.erb
View file

@ -4,7 +4,7 @@
done_todo_options = {:append_descriptor => suffix_completed, :suppress_context => true, :parent_container_type => 'context'}
-%>
<div id="display_box">
<%= render :partial => @context, :locals => { :settings => {:collapsible => false, :show_empty_containers => true }} %>
<%= render :partial => @context, :locals => { :settings => {:collapsible => false, :show_empty_containers => true, :parent_container_type => 'context' }} %>
<%= show_deferred_pending_todos(@deferred_todos, @pending_todos, deferred_pending_options) %>

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

@ -10,14 +10,15 @@ cache [project, @source_view, current_user.date.strftime("%Y%m%d")] do
<%=
title = source_view_is(:project) ? t('projects.actions_in_project_title') : show_project_name(project)
render :partial => 'todos/collection',
render(:partial => 'todos/collection',
:object => @not_done,
:locals => { :settings => {
:id => "p#{project.id}",
:collapsible => settings[:collapsible],
:title => title,
:container_name => 'project',
:show_empty_containers => settings[:show_empty_containers]
}}
:show_empty_containers => settings[:show_empty_containers],
:parent_container_type => settings[:parent_container_type]
}})
%>
<% end -%>

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

@ -9,7 +9,7 @@
<div id="display_box">
<%= project_next_prev %>
<%= render :partial => @project, :locals => {:settings => {:collapsible => false, :show_empty_containers => true }} %>
<%= render :partial => @project, :locals => {:settings => {:collapsible => false, :show_empty_containers => true, :parent_container_type => 'project' }} %>
<%= show_deferred_pending_todos(@deferred_todos, @pending_todos, deferred_pending_options) %>

2
app/views/todos/index.html.erb
View file

@ -7,7 +7,7 @@
<%= show_todos_without_project(@todos_without_project) -%>
<% end -%>
<%= show_done_todos(@done, {:parent_container_type => 'home', :collapsible => true}) unless @done.nil? %>
<%= show_done_todos(@done, {:parent_container_type => @group_view_by, :collapsible => true}) unless @done.nil? %>
</div>
<div id="input_box">