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

Merge branch 'master' into new-gui

Browse source 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/tracks.css.scss
	app/controllers/todos_controller.rb
	app/services/rich_message_extractor.rb
	app/services/todo_from_rich_message.rb
	app/views/todos/all_done.html.erb
	config/initializers/rack-mini-profiler.rb
	test/models/rich_message_extractor_test.rb
	test/models/todo_from_rich_message_test.rb
This commit is contained in:
Reinier Balt 2014-03-06 10:31:39 +01:00
commit 899df1ef8f
33 changed files with 1487 additions and 1313 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/application_helper.rb
View file

@ -230,7 +230,7 @@ module ApplicationHelper
when "projects"
send("#{type}_todos_project_path", @project)
when "todos"
if source_view_is(:tag)
if @tag_name
send("#{type}_tag_path",@tag_name)
else
send("#{type}_todos_path")

3
app/helpers/todos_helper.rb
View file

@ -513,7 +513,7 @@ module TodosHelper
)
end
return false if source_view_is_one_of(:calendar, :done)
return false if source_view_is_one_of(:calendar, :done, :all_done)
return @remaining_in_context == 0
end
@ -682,6 +682,7 @@ module TodosHelper
}
page.todo { container_id = context_container_empty_id(@original_item) if @remaining_in_context == 0 }
page.done { container_id = "completed_#{@original_completed_period}_container-empty-d" if @remaining_in_context == 0 }
page.all_done { container_id = "all-done-empty-nd" if @remaining_in_context == 0 }
end
return container_id.blank? ? "" : "$(\"##{container_id}\").slideDown(100);".html_safe
end