backlog 0.3.3 → 0.3.4

data/History.txt

@@ -1,3 +1,8 @@
+== 0.3.4 2007-08-03
+
+* Fixed bugs around task positioning and validation
+* Fixed bugs in task view
+
 == 0.3.3 2007-08-03
 
 * Made validation of tasks position tighter

data/Rakefile

@@ -11,7 +11,10 @@ require 'tasks/rails'
 
 require 'hoe'
 
-Hoe.new("backlog", '0.3.3') do |p|
+first_history_line = File.readlines('History.txt')[0].chomp
+version = (/^== (\d+.\d+.\d+) .*$/.match first_history_line)[1]
+
+Hoe.new("backlog", version) do |p|
   p.rubyforge_name = "backlog"
   p.summary = "Application to aid collecting, processing, organizing, reviewing and doing tasks."
   p.description = p.paragraphs_of('README.txt', 0..-1).join("\n\n")
@@ -23,3 +26,8 @@ Hoe.new("backlog", '0.3.3') do |p|
   }
   p.need_zip = true
 end
+
+task :rel do
+  ENV['VERSION'] = version
+  Rake::Task[:release].invoke
+end

data/app/models/task.rb

@@ -20,7 +20,7 @@ class Task < ActiveRecord::Base
   #validates_absence_of :position, :if => :finished_at
   #validates_absence_of :finished_at, :if => :position
   validates_presence_of :resolution, :if => :finished_at
-  validates_uniqueness_of :description, :scope => :backlog_id, :if => :backlog_id
+  validates_uniqueness_of :description, :scope => :backlog_id, :if => Proc.new {|task| task.backlog_id && task.previous_task_id.nil?}
   validates_uniqueness_of :description, :scope => :period_id, :if => :period_id
   validates_uniqueness_of :position, :scope => :period_id, :if => :period_id, :allow_nil => true
   validates_uniqueness_of :position, :scope => :parent_id, :if => :parent_id, :allow_nil => true
@@ -103,6 +103,7 @@ class Task < ActiveRecord::Base
   def open
     if finished_at
       insert_at 1
+      self.position = 1
       self.finished_at = nil
       self.resolution = nil
       estimate(initial_estimate)
@@ -137,7 +138,7 @@ class Task < ActiveRecord::Base
     new_task.estimate(self.todo)
     new_task.move_to_top
     new_task.estimate(self.todo)
-    self.finish(new_task.period.party == self.period.party ? Task::POSTPONED : Task::MOVED, true, current_user)
+    self.finish(new_task.period.party == self.period.party ? Task::POSTPONED : Task::MOVED, true)
   end
   
   def finish(resolution, save_work)
@@ -283,15 +284,7 @@ class Task < ActiveRecord::Base
       end
     end
     new_work.user = current_user
-begin
     new_work.save!
-rescue Exception => e
-p e
-p e.record
-p e.record.task
-p e.record.task.errors
-p e.record.task.errors.full_messages
-end
   end
   
   def works_with_children

data/app/views/tasks/_task.rhtml

@@ -1,7 +1,7 @@
 <% @task = task %>
   <tr valign="top" <%= 'class="highlight"' if highlight %>>
     <td width="1">
-    <% if @task.enable_subtasks? && @task.period.active_or_future? && active %>
+    <% if @task.enable_subtasks? && @task.period && @task.period.active_or_future? && active %>
       <% form_tag({:controller => 'tasks', :action => :specify, :id => @task}) do %>
         <%= image_button_to('add.png', l(:specify), :controller => 'tasks', :action => :specify, :id => @task.id)%>
       <% end %>
@@ -13,7 +13,7 @@
       <%= l(@task.resolution.downcase) if @task.finished_at %>
       <%= "-" if @task.children.size > 0 %>
     </td>
-    <td id="<%=@task.id%>" <%if active && @task.period.active_or_future?%>class="tasks" style=cursor:move;"<%end%>>
+    <td id="<%=@task.id%>" <%if active && @task.period && @task.period.active_or_future?%>class="tasks" style=cursor:move;"<%end%>>
       <% if @task.active? -%>
         <%= in_place_editor_field(:task, :description, {:id => "#{@task.id}_description", :tabindex => i}, :url => url_for(:controller => 'tasks', :action => "set_task_description", :id => @task)) %>
       <% else -%>
@@ -28,7 +28,7 @@
             <%= text_field 'work', 'started_at_time', :tabindex => i+1, :value => @task.started_work.started_at.strftime('%H:%M'),
                 :class => :task_time, :maxlength => 5, :onkeypress => "handleEvent(this, event, #{@task.id})" %>
             <%= image_button_to('ernes_stop.png', l(:end_work), :controller => 'tasks', :action => :end_work, :id => @task.id) %>
-          <% elsif @task.track_times? && @task.period.active? %>
+          <% elsif @task.track_times? && @task.period && @task.period.active? %>
             <%= image_button_to 'hammer.png', l(:start_work), :controller => 'tasks', :action => :start_work, :id => @task.id %>
           <% end -%>
         <% end %>
@@ -83,7 +83,7 @@
     </td>
   </tr>
 
-<% if active && @task.period.active_or_future? %>
+<% if active && @task.period && @task.period.active_or_future? %>
 <%= draggable_element "#{@task.id}", :revert => true, :constraint => "'vertical'" %>
 <%= drop_receiving_element "#{@task.id}",
       :update => "spotlight", :url => {:controller => 'tasks', :action => "move_to", :position => @task.position},

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 date: 2007-08-03 00:00:00 +02:00
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.
 require_paths: