backlog 0.14.1 → 0.14.2

data/History.txt

@@ -1,3 +1,15 @@
+== 0.14.2 2007-11-19
+
+=== Features
+
+* Changed to allow changing of work account on already existing work records.
+* Hide fields for task estimate when editing work records.
+* Made detours from weekly work sheet return to the weekly work sheet.
+ 
+=== Fixes
+
+* Fixed bug in Work form.
+
 == 0.14.1 2007-11-19
 
 === Features

data/app/controllers/works_controller.rb

@@ -72,6 +72,7 @@ class WorksController < ApplicationController
     @work = Work.find(params[:id])
     @work.attributes = params[:work]
     @estimate = Estimate.new(params[:estimate])
+    @work_accounts = WorkAccount.find(:all)
     @tasks = Task.find_open
     @users = User.find(:all)
   end

data/app/views/works/_form.rhtml

@@ -1,12 +1,11 @@
 <!--[form:work]-->
 
 <p><%=l :work_account%>:<br/>
-<% if @work.work_account %>
-<h4><%=link_to @work.work_account.name, :controller => 'work_accounts', :action => :edit, :id => @work.work_account_id %></h4></p>
-<%= hidden_field 'work', 'work_account_id' %>
-<% else %>
-<%= select 'work', 'work_account_id', @work_accounts.map{|wa| [wa.name, wa.id]}.sort %></p>
-<% end %>
+<%= select 'work', 'work_account_id', @work_accounts.map{|wa| [wa.name, wa.id]}.sort %>
+<% if @work.work_account -%>
+  <%=image_detour_to('work_account.png', "#{l(:work_account)} #{@work.work_account.name}", {:controller => 'work_accounts', :action => :edit, :id => @work.work_account}, {:class => 'image-submit', :style => 'vertical-align: bottom'}) %>
+<% end -%>
+</p>
 
 <p><%=l :task%>:<br/>
 <% if @work.task %>
@@ -72,6 +71,7 @@
 
 <br clear="all"/>
 
+<% if params[:estimate] %>
 <% if @work.task.nil? || @work.task.track_todo?%>
 <p><label for="estimate_todo"><%=l :todo%></label><br/>
 <%= text_field 'estimate', 'todo', :class => :task_hours %>
@@ -88,6 +88,7 @@
 <br clear="all" />
 </p>
 <% end %>
+<% end %>
 
 <!--[eoform:work]-->
 

data/app/views/works/weekly_work_sheet.rhtml

@@ -55,10 +55,10 @@ end %>]
       <% day_totals[day] += @work.hours %>
       <% week_total += @work.hours %>
     <td>
-      <%=link_to(h(@work.task.period.name), :controller => 'periods', :action => :show, :id => @work.task.period) if @work.task && @work.task.period %>
-      <%=link_to(h(@work.task.root_task.backlog.name), :controller => 'backlogs', :action => :show, :id => @work.task.root_task.backlog) if @work.task %>
-      <%=link_to(h(@work.task.description), :controller => 'periods', :action => :show, :id => @work.task.period, :task_id => @work.task.id) if @work.task%>
-      <%=link_to(l(:edit), :controller => 'works', :action => :edit, :id => @work.id) %>
+      <%=image_detour_to('hammer.png', l(:edit), {:style => "float: right;"}, :controller => 'works', :action => :edit, :id => @work.id) %>
+      <%=detour_to(h(@work.task.period.name), :controller => 'periods', :action => :show, :id => @work.task.period) if @work.task && @work.task.period %>
+      <%=detour_to(h(@work.work_account.name), :controller => 'work_accounts', :action => :show, :id => @work.work_account_id) %>:
+      <%=detour_to(h(@work.task.description), :controller => 'tasks', :action => :edit, :id => @work.task_id) if @work.task_id%>
     </td>
       <% if invoicing %>
     <td id="invoice_<%=@work.id%>">

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.14.1
+  version: 0.14.2
 date: 2007-11-19 00:00:00 +01:00
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.
 require_paths: