backlog 0.9.0 → 0.9.1

data/History.txt

@@ -1,3 +1,13 @@
+== 0.9.1 2007-09-09
+
+=== Fixes
+
+* Fixed loading of database config in production environment.
+* Fixed misaligned columns in weekly work sheet when invoicing is disabled.
+* Added "Back" link from Show Backlog view.
+* Fixed focus in Edit Backlog view.
+* Added navigation buttons in Edit Backlog view.
+
 == 0.9.0 2007-09-07
 
 === Features

data/README.txt

@@ -32,8 +32,8 @@ If you have concrete needs, and are willing to beta test the integration, please
 
 * Install ruby
 * Install RubyGems
-* Install PostgreSQL
-* Install ImageMagick or GraphicsMagick
+* Install PostgreSQL (or other database management system)
+* Install ImageMagick or GraphicsMagick (only required if you want graphs)
 * run <tt>sudo gem install backlog -y</tt>
 * run <tt>sudo backlog setup_unix</tt>
 * run <tt>sudo backlog start</tt>

data/Rakefile

@@ -19,7 +19,7 @@ Hoe.new("backlog", APP::VERSION) do |p|
   p.author = 'Uwe Kubosch'
   p.email = 'uwe@kubosch.no'
   p.remote_rdoc_dir = '' # Release to root
-  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
+  p.changes = p.paragraphs_of('History.txt', 0..4).join("\n\n")
   p.rdoc_pattern = /^(app\/(controllers|helpers|models)|lib|bin)|txt$/
   p.clean_globs = ['doc']
   p.spec_extras = {

data/app/helpers/application_helper.rb

@@ -37,13 +37,17 @@ module ApplicationHelper
     image_options.update :alt => title, :title => title
     link_to image_tag(image_source, image_options), url_options, post ? {:method => :post} : nil
   end
+
+  def detour?
+    not session[:detours].nil?
+  end
   
-  def back_or_link_to(title, options)
+  def back_or_link_to(title, options = nil)
     if session[:detours]
       options = {:return_from_detour => true}.update(session[:detours].last)
       logger.debug "linked return from detour: #{options}"
     end
-    link_to title, options
+    link_to(title, options) if options
   end
   
   def t(time_as_float)

data/app/models/task.rb

@@ -234,6 +234,10 @@ class Task < ActiveRecord::Base
     root_task
   end
   
+  def invoicing?
+    root_task.backlog.enable_invoicing?
+  end
+  
   def track_done?
     root_task.backlog.track_done
   end

data/app/views/backlogs/_buttons.rhtml

@@ -0,0 +1,3 @@
+    	<%=image_link_to 'arrow_up.png', l(:backlogs), :action => :list %>
+        <%=image_detour_to('clipboard.png', l(:edit), :controller => 'backlogs', :action => :edit, :id => @backlog)%>
+        <%=image_detour_to('clipboard.png', l(:show), :controller => 'backlogs', :action => :show, :id => @backlog)%>

data/app/views/backlogs/_form.rhtml

@@ -43,5 +43,5 @@
 
 
 <script type="text/JavaScript">
-document.forms[0].elements[0].focus();
+document.getElementById('backlog_name').focus();
 </script>

data/app/views/backlogs/_tasks.rhtml

@@ -1,8 +1,6 @@
   <div class="mainblock">
     <div class="btitle">
-    	<%=image_link_to 'arrow_up.png', l(:backlogs), :action => :list %>
-        <%=image_detour_to('clipboard.png', l(:edit), :controller => 'backlogs', :action => :edit)%>
-        <%=image_detour_to('clipboard.png', l(:show), :controller => 'backlogs', :action => :show)%>
+    	<%=render :partial => 'buttons'%>
         <h4><%=l :tasks%></h4>
     </div>
         
@@ -19,6 +17,7 @@
         <%= render :partial => '/tasks/task/', :locals => {:task => @task, :i => i += 1, :active => true, :highlight_task => false, :update => :maincontent} %>
       <% end %>
     </table>
+    <%= back_or_link_to(l :back) %>
   </div>
 
   <div class="mainblock">

data/app/views/backlogs/edit.rhtml

@@ -1,6 +1,11 @@
 <% @page_title = "#{l(:editing)} #{l(:backlog)}" %>
 
 <div id="spotlight">
+    <div class="btitle">
+    	<%=render :partial => 'buttons'%>
+		<h4><%=@backlog.name%></h4>
+    </div>
+
   <% form_tag :action => 'update', :id => @backlog do %>
     <%= render :partial => 'form' %>
     <%= submit_tag l(:save) %>

data/app/views/works/weekly_work_sheet.rhtml

@@ -59,9 +59,11 @@ end %>]
       <%=link_to(h(@work.task.backlog.name), :controller => 'backlogs', :action => :show, :id => @work.task.backlog) %>
       <%=link_to(h(@work.task.description), :controller => 'periods', :action => :show, :id => @work.task.period, :task_id => @work.task.id) %>
     </td>
+      <% if invoicing %>
     <td id="invoice_<%=@work.id%>">
-      <%=check_box(:work, :invoice, :onchange => "new Ajax.Updater('invoice_#{@work}', '#{url_for(:action => :set_work_invoice, :id => @work)}' + '?value=' + this.checked);") if @work.task.period && @work.task.period.invoice? %>
+      <%=check_box(:work, :invoice, :onchange => "new Ajax.Updater('invoice_#{@work}', '#{url_for(:action => :set_work_invoice, :id => @work)}' + '?value=' + this.checked);") if @work.task.invoicing? %>
     </td>
+      <% end %>
       <% if track_times %>
     <td align="right"><%=in_place_editor_field(:work, :started_at_time, :class => :task_time) %></td>
     <td align="right"><%=in_place_editor_field(:work, :completed_at_time, :class => :task_time) %></td>
@@ -69,7 +71,9 @@ end %>]
     <td align="right"><%=in_place_editor_field(:work, :hours, {}, :value => '%.2f' % @work.hours) %></td>
     <% else %>
     <td/>
+      <% if invoicing %>
     <td/>
+      <% end %>
       <% if track_times %>
     <td/>
     <td/>

data/config/environment.rb

@@ -1,6 +1,18 @@
 require 'yaml'
 require 'rbconfig'
 
+# Be sure to restart your web server when you modify this file.
+
+# Uncomment below to force Rails into production mode when 
+# you don't control web/app server and can't set it the proper way
+# ENV['RAILS_ENV'] ||= 'production'
+
+# Specifies gem version of Rails to use when vendor/rails is not present
+# RAILS_GEM_VERSION = '1.1.4'
+
+# Bootstrap the Rails environment, frameworks, and default configuration
+require File.join(File.dirname(__FILE__), 'boot')
+
 # The following section has been added to load database settings from system config.
 APP_CONFIG_FILE = Config::CONFIG["sysconfdir"] + '/backlog.conf'
 if File.exists? APP_CONFIG_FILE
@@ -16,18 +28,6 @@ if File.exists? APP_CONFIG_FILE
   end
 end
 
-# Be sure to restart your web server when you modify this file.
-
-# Uncomment below to force Rails into production mode when 
-# you don't control web/app server and can't set it the proper way
-# ENV['RAILS_ENV'] ||= 'production'
-
-# Specifies gem version of Rails to use when vendor/rails is not present
-# RAILS_GEM_VERSION = '1.1.4'
-
-# Bootstrap the Rails environment, frameworks, and default configuration
-require File.join(File.dirname(__FILE__), 'boot')
-
 Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence those specified here
   

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
-date: 2007-09-07 00:00:00 +02:00
+  version: 0.9.1
+date: 2007-09-09 00:00:00 +02:00
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.
 require_paths: 
 - lib
@@ -1742,6 +1742,7 @@ files:
 - app/views/backlogs
 - app/views/backlogs/_name_list.rhtml
 - app/views/backlogs/list.rhtml
+- app/views/backlogs/_buttons.rhtml
 - app/views/backlogs/show.rhtml
 - app/views/backlogs/_form.rhtml
 - app/views/backlogs/new.rhtml