backlog 0.31.0 → 0.31.1

data/History.txt

@@ -1,3 +1,9 @@
+== 0.31.1 2008-04-24
+
+=== Fixes
+
+* Fixed moving of subtasks.  Now supertasks are also moved.
+
 == 0.31.0 2008-04-14
 
 === Features
@@ -10,10 +16,6 @@
 * Added list of all task owners to Edit Task view.
 * Changed so that the creator of a task automatically grabs it.
 
-=== Internal
-
-* 
-
 == 0.30.0 2008-04-09
 
 === Features

data/app/models/task.rb

@@ -69,6 +69,14 @@ class Task < ActiveRecord::Base
   def self.recent_conditions
     return "finished_at >= '#{1.week.ago.iso8601}'"
   end
+
+  def self.find_descendant(period_id, ancestor_task_id)
+    candidate_tasks = Task.find :all, 
+        :conditions => ["id = ? OR previous_task_id = ?", ancestor_task_id, ancestor_task_id]
+    candidate_tasks = candidate_tasks.select {|t| t.root_task.period_id == period_id}
+    logger.error "Multiple descendants in period: #{period_id} #{ancestor_task_id}" if candidate_tasks.size > 1
+    candidate_tasks[0]
+  end
   
   def self_with_children
     [self] << children.map {|t| t.self_with_children}.flatten
@@ -158,9 +166,13 @@ class Task < ActiveRecord::Base
     
     if self.period
       old_todo = self.todo
-      self.finish((new_period.nil? || (new_period.party == self.period.party)) ? Task::POSTPONED : Task::MOVED, true)
-      ancestor_id = self.previous_task_id || self.id
-      existing_task =   Task.find_by_period_id_and_id(new_period && new_period.id, ancestor_id)
+      if parent
+        parent.move_to_period new_period
+      end
+      if leaf?
+        self.finish((new_period.nil? || (new_period.party == self.period.party)) ? Task::POSTPONED : Task::MOVED, true)
+      end
+      existing_task = Task.find_descendant(new_period && new_period.id, ancestor_id)
       if existing_task ||= Task.find_by_period_id_and_previous_task_id(new_period && new_period.id, ancestor_id)
         raise "mismatch" unless existing_task.backlog == root_task.backlog
         raise "Mismatch" unless existing_task.period == new_period
@@ -173,8 +185,13 @@ class Task < ActiveRecord::Base
       else
         new_task = Task.new
         new_task.previous_task_id = ancestor_id
-        new_task.backlog = root_task.backlog
-        new_task.period = new_period
+        if parent
+          new_parent = Task.find_descendant(new_period.id, parent.ancestor_id)
+          new_task.parent = new_parent
+        else
+          new_task.backlog = root_task.backlog
+          new_task.period = new_period
+        end
         new_task.description = self.description
         new_task.initial_estimate = self.initial_estimate
         new_task.position = nil
@@ -405,4 +422,8 @@ class Task < ActiveRecord::Base
     end
   end
 
+  def ancestor_id
+    previous_task_id || id
+  end
+  
 end

data/config/routes.rb

@@ -1,6 +1,4 @@
 ActionController::Routing::Routes.draw do |map|
-  map.resources :tasks
-  
   map.connect '', :controller => "welcome"
   map.connect ':controller/:action/:year/:week'
   map.connect ':controller/:action/:id.:format'

data/test/functional/periods_controller_test.rb

@@ -131,6 +131,16 @@ class PeriodsControllerTest < Test::Unit::TestCase
     check_move_effects(before, :future)
   end
   
+  def test_move_task_to_next_period
+    before = Task.find(tasks(:another).id)
+    
+    post :move_task_to_next_period, :id => tasks(:another).id
+    
+    assert_response :redirect
+    
+    check_move_effects(before, :future)
+  end
+  
   def test_move_task_to_next_period_xhr
     before = Task.find(tasks(:another).id)
     

data/test/unit/task_test.rb

@@ -23,4 +23,51 @@ class TaskTest < Test::Unit::TestCase
     tasks(:first).start_work
     tasks(:another).start_work
   end
+  
+  def test_move_task_to_period
+    before = Task.find(tasks(:another).id)
+    period = periods(:future)
+    
+    before.move_to_period period
+    
+    check_move_effects(before, :future)
+  end
+
+  def test_move_task_to_period_subtask
+    before = Task.find(tasks(:subsubtask).id)
+    period = periods(:future)
+
+    before.move_to_period period
+    
+    check_move_effects(before, :future)
+  end
+
+  private
+  
+  def check_move_effects(before, period_sym)
+    after = Task.find(before.id)
+    assert_equal before.period_id, after.period_id
+    assert_equal Task::POSTPONED, after.resolution
+    assert_not_nil after.finished_at
+    
+    newest_task = Task.find(:first, :order => 'id DESC')
+    new_task = Task.find_descendant(periods(period_sym).id, before.id)
+    assert_not_nil newest_task
+    assert_not_nil new_task
+    assert_equal newest_task.id, new_task.id
+    assert_equal before.previous_task_id || before.id, new_task.previous_task_id
+    assert_nil new_task.finished_at
+    assert_nil new_task.resolution
+    assert_equal 1, new_task.position
+    
+    while before.parent
+      before = before.parent
+      new_parent_task = Task.find_descendant(periods(period_sym).id, before.id)
+      assert new_parent_task
+      assert_equal new_parent_task.id, new_task.parent_id
+      new_task = new_parent_task
+    end
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.31.0
+  version: 0.31.1
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-16 00:00:00 +02:00
+date: 2008-04-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency