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

fix #1123 and fix #1124 and refactor drag and drop a bit

Browse source
This commit is contained in:
Reinier Balt 2011-03-11 21:01:24 +01:00
parent 15a2eb6f08
commit bc73b18bed
9 changed files with 364 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/controllers/todos_controller.rb
View file

@ -241,15 +241,19 @@ class TodosController < ApplicationController
@predecessor = current_user.todos.find(params['predecessor'])
@todo = current_user.todos.find(params['successor'])
@original_state = @todo.state
# Add predecessor
@todo.add_predecessor(@predecessor)
@todo.state = 'pending'
@saved = @todo.save
unless @predecessor.completed?
# Add predecessor
@todo.add_predecessor(@predecessor)
@todo.state = 'pending'
@saved = @todo.save
@status_message = t('todos.added_dependency', :dependency => @predecessor.description)
@status_message += t('todos.set_to_pending', :task => @todo.description) unless @original_state == 'pending'
else
@saved = false
end
respond_to do |format|
format.js {
@status_message = t('todos.added_dependency', :dependency => @predecessor.description)
@status_message += t('todos.set_to_pending', :task => @todo.description) unless @original_state == 'pending'
}
format.js
end
end
@ -342,7 +346,8 @@ class TodosController < ApplicationController
@saved = @todo.save
@context_changed = true
@message = t('todos.context_changed', :name => @context.name)
@status_message = t('todos.context_changed', :name => @context.name)
determine_down_count
determine_remaining_in_context_count(@original_item_context_id)
respond_to do |format|