backlog 0.30.0 → 0.31.0

data/History.txt

@@ -1,4 +1,20 @@
-== 0.30.0 2008-04-08
+== 0.31.0 2008-04-14
+
+=== Features
+
+* Register and display who created a task and who made the last update.
+
+=== Fixes
+
+* Fixed layout in Daily Work Sheet
+* 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/README.txt

@@ -1,4 +1,4 @@
-<img align="right" src="Screenshot.png"/>
+http://backlog.rubyforge.org/files/Screenshot.png
 
 == Backlog
 

data/app/controllers/tasks_controller.rb

@@ -35,6 +35,7 @@ class TasksController < ApplicationController
         @task.task_files.create! :name => file.original_filename, :content_data => file.read, :content_type => file.content_type
       end
       @task.move_to_top
+      @task.grab
       if @task.period
         back_or_redirect_to :controller => 'periods', :action => 'show', :id => @task.period, :task => @task.id
       else

data/app/models/task.rb

@@ -19,6 +19,8 @@ class Task < ActiveRecord::Base
   has_many :works, :order => 'completed_at', :dependent => :destroy
   has_many :task_files, :dependent => :destroy
   has_and_belongs_to_many :users
+  belongs_to :creator, :class_name => 'User', :foreign_key => 'created_by'
+  belongs_to :updater, :class_name => 'User', :foreign_key => 'updated_by'
   
   acts_as_list :scope => '#{parent_id ? "parent_id = #{parent_id}" : period_id ? "period_id = #{period_id}" : "period_id IS NULL AND parent_id IS NULL AND backlog_id = #{backlog_id}"} AND finished_at IS NULL'
   acts_as_tree :order => 'position'
@@ -38,9 +40,12 @@ class Task < ActiveRecord::Base
   validates_uniqueness_of :position, :scope => :period_id, :if => :period_id, :allow_nil => true
   validates_uniqueness_of :position, :scope => [:period_id, :parent_id, :backlog_id], :if => Proc.new {|task| task.period_id.nil? && task.parent_id.nil?}, :allow_nil => true
   
+  before_create {|record| record.created_by = current_user.id}
+  before_save {|record| record.updated_by = current_user.id}
+  
   def validate
     if self.parent_id && (self.period_id || self.backlog_id)
-      errors.add :parent_id, "A subtask may not have neither period nor backlog set."
+      errors.add :parent_id, "A subtask may have neither period nor backlog set."
     end
     if new_record? && self.period && self.period.passed?
       errors.add :period_id, "You may not add a task to a past period."
@@ -399,5 +404,5 @@ class Task < ActiveRecord::Base
       "#{parent.description_with_parents} - #{description}"
     end
   end
-  
+
 end

data/app/views/tasks/_form.rhtml

@@ -79,15 +79,20 @@
     <p><label><%=l :ownership%></label><br/>
     	<%= if @task.users.empty?
 				l(:not_grabbed)
-			elsif @task.users.include? current_user
-				l(:grabbed_by_you)
+			else
+				@task.users.map do |user|
+					link_to h(user.name), :controller => :user, :action => :edit, :id => user.id
+				end.join(', ')
 			end
 		%>
 		<br/>
 		<% if @task.period %>
-			<%=l :invite%>:
-			<% @task.period.party.users.each do |user| %>
-				<%=link_to "#{user.name}", :action => :invite, :id => @task.id, :user_id => user.id unless @task.users.include? user%>
+			<% invitable_users = @task.period.party.users - @task.users %>
+			<% unless invitable_users.empty?%>
+				<%=l :invite%>:
+				<% invitable_users.each do |user| %>
+					<%=link_to "#{user.name}", :action => :invite, :id => @task.id, :user_id => user.id%>
+				<% end %>
 			<% end %>
 		<% end %>
 	</p>

data/app/views/tasks/edit.rhtml

@@ -67,10 +67,15 @@
 
 <br clear="all" />
 
+<div style="float: right">
+	<%=l :created_by%>: <%=@task.creator.name if @task.created_by%><br>
+	<%=l :updated_by%>: <%=@task.updater.name if @task.updated_by%>
+</div>
+
 <% form_tag({:action => 'update', :id => @task}, :multipart => true) do %>
-  <%= render :partial => 'form' %>
-  <%= submit_tag l(:save) %>
-  <%= back_or_link_to l(:back), :action => 'list' %>
+  <%=render :partial => 'form' %>
+  <%=submit_tag l(:save) %>
+  <%=back_or_link_to l(:back), :action => 'list' %>
 <% end %>
 
 </div>

data/app/views/works/daily_work_sheet.rhtml

@@ -78,13 +78,14 @@
 	<th/>
 	<th/>
   </tr>
-</table>
-  <%= back_or_link_to l(:back), '' %>
 <% end %>
 
+</table>
+
+<%=back_or_link_to l(:back), '' %>
 
 <% if @period %>
-<%= link_to l(:back), :controller => 'periods', :action => :show, :id => @period %>
+	<%=link_to l(:back), :controller => 'periods', :action => :show, :id => @period %>
 <% end %>
 </div>
 

data/config/routes.rb

@@ -1,4 +1,6 @@
 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/lang/en.yaml

@@ -18,6 +18,7 @@ completed: Completed
 completed_at: Ended at
 completed_tasks: Completed Tasks
 confirmation: Are you sure?
+created_by: Created by
 customer: Customer
 daily_work_sheet: Daily work sheet
 delete: Delete
@@ -125,6 +126,7 @@ tuesday: Tuesday
 unlock: Unlock
 unplanned_tasks: Unplanned tasks
 up: Up
+updated_by: Updated by
 user: User
 view_fullscreen: View fullscreen
 wednesday: Wednesday

data/lang/no.yaml

@@ -18,6 +18,7 @@ completed: Fullført
 completed_at: Stop tid
 completed_tasks: Fullførte Oppgaver
 confirmation: Er du sikker?
+created_by: Opprettet av
 customer: Kunde
 daily_work_sheet: Timeføringsskjema
 delete: Slett
@@ -124,6 +125,7 @@ tuesday: Tirsdag
 unlock: Lås opp
 unplanned_tasks: Ikke planlagte oppgaver
 up: Opp
+updated_by: Oppdatert av
 user: Bruker
 view_fullscreen: Vis fullskjerm
 wednesday: Onsdag

metadata

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