backlog 0.14.0 → 0.14.1

data/History.txt

@@ -1,3 +1,17 @@
+== 0.14.1 2007-11-19
+
+=== Features
+
+* Added link to Show Backlog view from Show task view.
+
+=== Fixes
+
+* Added error messages to Update Task view.
+* Fixed bug in Reopen Task action in the Show Task view.
+* Fixed missing template for Search action.
+* Fixed display of unplanned completed tasks.
+* Added adjustment of list position for backup restoration.
+
 == 0.14.0 2007-11-18
 
 === Features

data/app/controllers/tasks_controller.rb

@@ -49,7 +49,7 @@ class TasksController < ApplicationController
   end
   
   def edit
-    @task = Task.find(params[:id])
+    @task ||= Task.find(params[:id])
     @task.period_id = params[:task][:period_id] if params[:task] && params[:task][:period_id]
     @periods = Period.find_active_or_future
     @backlogs = Backlog.find(:all, :order => 'name')
@@ -108,7 +108,7 @@ class TasksController < ApplicationController
         end
       else
         if @task.finished_at
-          reopen
+          @task.reopen
         else
           if @task.period
             back_or_redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task => @task.id

data/app/models/task.rb

@@ -132,7 +132,7 @@ class Task < ActiveRecord::Base
   
   def reopen
     if period && period.passed?
-      flash[:notice] = "You cannot reopen a task in a period that is passed."
+      raise "You cannot reopen a task in a period that is passed."
     else
       open
       save!

data/app/views/tasks/_completed.rhtml

@@ -1,6 +1,6 @@
 <div id="completed_tasks">
 <% @completed_tasks.map {|t| t.period}.uniq.each do |period| %>
-<table id="completed_tasks_<%=period.id%>" class="input">
+<table id="completed_tasks_<%=period ? period.id : 'unplanned'%>" class="input">
   <%= render :partial => '/tasks/period_header', :locals => {:period => period} unless @completed_tasks.map(&:period).uniq.size == 1 %>
   <%= render :partial => '/tasks/fields_header', :locals => {:backlog => @backlog, :active => false, :track_times => false} %>
   <% @completed_tasks.select {|t| t.period == period}.each do |task| %>

data/app/views/tasks/_form.rhtml

@@ -5,7 +5,7 @@
   <%= select 'task', 'backlog_id', [['', '']] + @backlogs.map{|backlog| [backlog.name, backlog.id]}, {}, :onchange => "form.action = '#{url_for}'; form.submit();" %>
 <% else %>
   <label for="task_backlog_id"><%=l :backlog%></label>:
-  <%= hidden_field 'task', 'backlog_id' %><%=h @task.backlog.name%>
+  <%=hidden_field 'task', 'backlog_id' %><%=detour_to h(@task.backlog.name), :controller => 'backlogs', :action => :show, :id => @task.backlog_id %>
 <% end %>
 <% if @task.backlog %>
   <%=image_detour_to('clipboard.png', "#{l(:backlog)} #{@task.backlog.name}", {:controller => 'backlogs', :action => :edit, :id => @task.backlog}, {:class => 'image-submit', :style => 'vertical-align: bottom'}) %>

data/lib/tasks/backup.rake

@@ -38,16 +38,11 @@ namespace :db do
           entity = klass.new(fixture)
           entity.id = fixture['id']
           entity.save_without_validation!
-          while entity.id < fixture['id']
-            puts "Skipping mising id #{entity.id}."
-            p entity.destroy
-            entity = klass.new(fixture)
+          if fixture.keys.include?('position') && entity.position != fixture['position'].to_i
+            puts "Adjusting position #{entity.position} => #{fixture['position']}"
+            entity.position = fixture['position']
             entity.save_without_validation!
           end
-          if klass.find_by_id(fixture['id']).nil?
-            p fixture
-            fixture.each {|k,v| p klass.find(:first, :conditions => ["#{k} = ?", v])}
-          end
           klass.find(fixture['id'])
         end
         if ActiveRecord::Base.connection.adapter_name.downcase == "postgresql"

data/test/fixtures/tasks.yml

@@ -70,3 +70,12 @@
     parent_id: 8
     description: sub sub task
     position: 1
+- completed:
+    id: 11
+    created_at: 2007-06-12
+    backlog_id: 1
+    period_id: 3
+    description: completed task
+    position: NULL
+    finished_at: 2007-08-02 14:15:42
+    resolution: COMPLETED

data/test/functional/backlogs_controller_test.rb

@@ -107,6 +107,30 @@ class BacklogsControllerTest < Test::Unit::TestCase
     assert_redirected_to :controller => 'tasks', :action => :list_started
   end
 
+  def test_abort_task
+    post :abort_task, :id => tasks(:first).id
+    
+    after = Task.find(tasks(:first).id)
+    assert_not_nil after.finished_at
+    assert_equal Task::ABORTED, after.resolution
+  end
+  
+  def test_finish_task
+    post :finish_task, :id => tasks(:first).id
+    
+    after = Task.find(tasks(:first).id)
+    assert_not_nil after.finished_at
+    assert_equal Task::COMPLETED, after.resolution
+  end
+  
+  def test_reopen_task
+    post :reopen_task, :id => tasks(:completed).id
+    
+    after = Task.find(tasks(:first).id)
+    assert_nil after.finished_at
+    assert_nil after.resolution
+  end
+  
   private
   
   # TODO (uwe): This method should be removed

data/test/functional/periods_controller_test.rb

@@ -5,7 +5,7 @@ require 'periods_controller'
 class PeriodsController; def rescue_action(e) raise e end; end
 
 class PeriodsControllerTest < Test::Unit::TestCase
-  fixtures :parties, :users, :groups, :groups_users, :periods, :tasks, :task_files, :works, :estimates
+  main_scenario
   
   def setup
     @controller = PeriodsController.new
@@ -237,4 +237,20 @@ class PeriodsControllerTest < Test::Unit::TestCase
     assert_equal Task::ABORTED, after.resolution
   end
   
+  def test_finish_task
+    post :finish_task, :id => tasks(:first).id
+    
+    after = Task.find(tasks(:first).id)
+    assert_not_nil after.finished_at
+    assert_equal Task::COMPLETED, after.resolution
+  end
+  
+  def test_reopen_task
+    post :reopen_task, :id => tasks(:completed).id
+    
+    after = Task.find(tasks(:first).id)
+    assert_nil after.finished_at
+    assert_nil after.resolution
+  end
+  
 end

data/test/functional/tasks_controller_test.rb

@@ -5,7 +5,7 @@ require 'tasks_controller'
 class TasksController; def rescue_action(e) raise e end; end
 
 class TasksControllerTest < Test::Unit::TestCase
-  fixtures :parties, :users, :groups, :groups_users, :backlogs, :periods, :tasks, :task_files, :works, :estimates
+  main_scenario
   
   def setup
     @controller = TasksController.new

data/test/functional/works_controller_test.rb

@@ -5,7 +5,7 @@ require 'works_controller'
 class WorksController; def rescue_action(e) raise e end; end
 
 class WorksControllerTest < Test::Unit::TestCase
-  fixtures :parties, :users, :groups, :groups_users, :work_accounts, :backlogs, :periods, :tasks, :task_files, :works, :estimates
+  main_scenario
   
   def setup
     @controller = WorksController.new

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.14.0
-date: 2007-11-18 00:00:00 +01:00
+  version: 0.14.1
+date: 2007-11-19 00:00:00 +01:00
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.
 require_paths: 
 - lib
@@ -443,7 +443,7 @@ files:
 - app/views/groups/new.rhtml
 - app/views/groups/edit.rhtml
 - app/views/search
-- app/views/search/results.html.erb
+- app/views/search/results.rhtml
 - app/views/work_accounts
 - app/views/work_accounts/_name_list.rhtml
 - app/views/work_accounts/list.rhtml