Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-03-15 00:36:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove option to show empty containers and start fixing failing cucumber scenarios

Browse source
This commit is contained in:
Reinier Balt 2013-03-10 22:51:31 +01:00
parent 22b371ef8c
commit ede898120c
11 changed files with 24 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,7 @@ 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 => @show_empty_containers
:show_empty_containers => settings[:show_empty_containers]
}}
%>

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 }} %>
<%= render :partial => @context, :locals => { :settings => {:collapsible => false, :show_empty_containers => true }} %>
<%= show_deferred_pending_todos(@deferred_todos, @pending_todos, deferred_pending_options) %>

1
app/views/layouts/application.html.erb
View file

@ -73,7 +73,6 @@
<li><%= navigation_link( t('layouts.navigation.stats'), stats_path, :title => t('layouts.navigation.stats_title')) %></li>
<li><hr/></li>
<%= group_view_by_menu_entry %>
<%= show_empty_containers_menu_entry %>
</ul>
</li>
<li><a href="#"><%= t('layouts.navigation.admin') %></a>

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

@ -3,8 +3,8 @@
<%= show_grouped_todos %>
<% if @group_view_by == 'context' -%>
<%= show_todos_without_project(@todos_with_project) unless @todos_without_project.nil? -%>
<% if @group_view_by == 'project' -%>
<%= show_todos_without_project(@todos_without_project) unless @todos_without_project.nil? -%>
<% end -%>
<%= show_done_todos(@done, {:collapsible => true}) unless @done.nil? %>

6
app/views/todos/update.js.erb
View file

@ -106,7 +106,7 @@ function html_for_todo() {
}
function html_for_new_context() {
return "<%= @saved && @new_context_created ? escape_javascript(render(:partial => @new_context, :locals => { :collapsible => true })) : "" %>";
return "<%= @saved && @new_context_created ? escape_javascript(render(:partial => @new_context, :locals => { :settings => {:collapsible => true }})) : "" %>";
}
function html_for_error_messages() {
@ -118,7 +118,7 @@ function update_predecessors(next_steps) {
<% if @removed_predecessors
@removed_predecessors.each do |p| -%>
if ($('#<%=item_container_id(p)%>')) {
$('#<%=dom_id(p)%>').html('<%=escape_javascript(render(:partial => p, :locals => { :parent_container_type => parent_container_type }))%>');
$('#<%=dom_id(p)%>').html('<%=escape_javascript(render(:partial => p, :locals => { :settings => {:parent_container_type => parent_container_type }}))%>');
}
<% end -%>
<% end -%>
@ -131,7 +131,7 @@ function regenerate_predecessor_family() {
until parents.empty?
parent = parents.pop
parents += parent.predecessors -%>
$('#<%= dom_id(parent) %>').html("<%= escape_javascript(render(:partial => parent, :locals => { :parent_container_type => parent_container_type })) %>");
$('#<%= dom_id(parent) %>').html("<%= escape_javascript(render(:partial => parent, :locals => { :settings => {:parent_container_type => parent_container_type }})) %>");
<%end
-%>
}