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

fix #1310. Add test for this

Browse source 
Found that I had a lot of tests commented out. They have some regressions I will fix later
This commit is contained in:
Reinier Balt 2012-07-15 21:28:42 +02:00
parent 5a24644aad
commit 7c1cd2a144
6 changed files with 696 additions and 694 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/tracks.js
View file

@ -518,8 +518,8 @@ var TodoItems = {
ui.draggable.remove(); ui.draggable.remove();
$('.drop_target').hide(); $('.drop_target').hide();
ajax_options = default_ajax_options_for_scripts('POST', relative_to_root('todos/change_context'), target); ajax_options = default_ajax_options_for_scripts('POST', relative_to_root('todos/'+dragged_todo + '/change_context'), target);
ajax_options.data += "&todo[id]="+dragged_todo + "&todo[context_id]="+context_id ajax_options.data += "&todo[context_id]="+context_id
$.ajax(ajax_options); $.ajax(ajax_options);
}, },
setup_drag_and_drop: function() { setup_drag_and_drop: function() {

8
app/controllers/todos_controller.rb
View file

@ -343,7 +343,7 @@ class TodosController < ApplicationController
def remove_predecessor def remove_predecessor
@source_view = params['_source_view'] || 'todo' @source_view = params['_source_view'] || 'todo'
@todo = current_user.todos.find_by_id(params['id']).includes(Todo::DEFAULT_INCLUDES) @todo = current_user.todos.includes(Todo::DEFAULT_INCLUDES).find_by_id(params['id'])
@predecessor = current_user.todos.find_by_id(params['predecessor']) @predecessor = current_user.todos.find_by_id(params['predecessor'])
@predecessors = @predecessor.predecessors @predecessors = @predecessor.predecessors
@successor = @todo @successor = @todo
@ -449,8 +449,8 @@ class TodosController < ApplicationController
end end
def change_context def change_context
# TODO: is this method used? # change context if you drag a todo to another context
@todo = Todo.find_by_id(params[:todo][:id]) @todo = Todo.find_by_id(params[:id])
@original_item_context_id = @todo.context_id @original_item_context_id = @todo.context_id
@context = Context.find_by_id(params[:todo][:context_id]) @context = Context.find_by_id(params[:todo][:context_id])
@todo.context = @context @todo.context = @context
@ -1225,7 +1225,7 @@ class TodosController < ApplicationController
end end
def update_todo_state_if_project_changed def update_todo_state_if_project_changed
if ( @project_changed ) then if @project_changed
@todo.update_state_from_project @todo.update_state_from_project
@remaining_undone_in_project = current_user.projects.find_by_id(@original_item_project_id).todos.active.count if source_view_is :project @remaining_undone_in_project = current_user.projects.find_by_id(@original_item_project_id).todos.active.count if source_view_is :project
end end

10
app/models/todo.rb
View file

@ -209,14 +209,14 @@ class Todo < ActiveRecord::Base
end end
def update_state_from_project def update_state_from_project
if self.state == 'project_hidden' and !self.project.hidden? if self.state == 'project_hidden' && !self.project.hidden?
if self.uncompleted_predecessors.empty? if self.uncompleted_predecessors.empty?
self.state = 'active' self.activate!
else else
self.state = 'pending' self.block!
end end
elsif self.state == 'active' and self.project.hidden? elsif self.state == 'active' && self.project.hidden?
self.state = 'project_hidden' self.hide!
end end
self.save! self.save!
end end

2
app/views/todos/index.rss.builder
View file

@ -12,7 +12,7 @@ xml.rss :version => "2.0" do
xml.title h(todo.description) xml.title h(todo.description)
xml.description feed_content_for_todo(todo) xml.description feed_content_for_todo(todo)
xml.pubDate todo.created_at.to_s(:rfc822) xml.pubDate todo.created_at.to_s(:rfc822)
xml.link todo.project ? project_url(todo.project) : context_url(todo.context) xml.link (todo.project && !todo.project.is_a?(NullProject)) ? project_url(todo.project) : context_url(todo.context)
xml.guid todo_url(todo) xml.guid todo_url(todo)
end end
end end

1
config/routes.rb
View file

@ -88,6 +88,7 @@ Tracksapp::Application.routes.draw do
get 'show_notes' get 'show_notes'
get 'convert_to_project' # TODO: convert to PUT/POST get 'convert_to_project' # TODO: convert to PUT/POST
get 'remove_predecessor' # TODO: convert to PUT/POST get 'remove_predecessor' # TODO: convert to PUT/POST
post 'change_context'
end end
collection do collection do
get 'done' get 'done'

1365
test/functional/todos_controller_test.rb
View file

File diff suppressed because it is too large Load diff