diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index dcbf8e06..58854e68 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -174,7 +174,10 @@ class TodosController < ApplicationController tag_list = params[:tag_list] + @sequential = !params[:todos_sequential].blank? && params[:todos_sequential]=='true' + @todos = [] + @predecessor = nil params[:todo][:multiple_todos].split("\n").map do |line| unless line.blank? @todo = current_user.todos.build( @@ -182,12 +185,20 @@ class TodosController < ApplicationController @todo.project_id = @project_id @todo.context_id = @context_id @saved = @todo.save + + if @predecessor && @saved && @sequential + @todo.add_predecessor(@predecessor) + @todo.block! + end + unless (@saved == false) || tag_list.blank? @todo.tag_with(tag_list) @todo.tags.reload end + @todos << @todo @not_done_todos << @todo if @new_context_created + @predecessor = @todo end end diff --git a/app/views/todos/_new_multi_todo_form.rhtml b/app/views/todos/_new_multi_todo_form.rhtml index d8346bb6..925a395a 100644 --- a/app/views/todos/_new_multi_todo_form.rhtml +++ b/app/views/todos/_new_multi_todo_form.rhtml @@ -22,6 +22,9 @@ <%= text_field_tag "multi_tag_list", @default_tags, :name=>:tag_list, :size => 30, :tabindex => next_tab_index %> <%= content_tag("div", "", :id => "tag_list_auto_complete", :class => "auto_complete") %> + <%= check_box_tag('todos_sequential', 'true', false, {:tabindex => next_tab_index}) %> + +