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

Override AASM's initial state if specified

Browse source 
Fixes #977
This commit is contained in:
Eric Allen 2010-05-08 19:30:58 -04:00
parent 0a95d430d4
commit fa98c0865e
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/todos_controller.rb
View file

@ -55,7 +55,7 @@ class TodosController < ApplicationController
predecessor_list = p.predecessor_list predecessor_list = p.predecessor_list
@todo = current_user.todos.build(p.attributes) @todo = current_user.todos.build(p.attributes)
if p.project_specified_by_name? if p.project_specified_by_name?
project = current_user.projects.find_or_create_by_name(p.project_name) project = current_user.projects.find_or_create_by_name(p.project_name)
@new_project_created = project.new_record_before_save? @new_project_created = project.new_record_before_save?
@ -70,8 +70,16 @@ class TodosController < ApplicationController
end end
@todo.add_predecessor_list(predecessor_list) @todo.add_predecessor_list(predecessor_list)
# Fix for #977 because AASM overrides @state on creation
specified_state = @todo.state
@todo.update_state_from_project @todo.update_state_from_project
@saved = @todo.save @saved = @todo.save
# Fix for #977 because AASM overrides @state on creation
@todo.update_attribute('state', specified_state) unless specified_state == "immediate"
unless (@saved == false) || tag_list.blank? unless (@saved == false) || tag_list.blank?
@todo.tag_with(tag_list) @todo.tag_with(tag_list)
@todo.tags.reload @todo.tags.reload