backlog 0.7.2 → 0.7.3

data/History.txt

@@ -1,3 +1,15 @@
+== 0.7.3 2007-08-17
+
+* Fixed bug in estimate creation
+* Added cruisecontrol.rb config file
+* Fixed mailing of password
+* Fixed find_by for class table inheritance subclasses
+* Fixed date limits for new periods
+* Fixed display of position in period edit view
+* Added link to current user in top of layout
+* Added display of periods to user view
+* Adjusted the legend in the burn down graphs
+
 == 0.7.2 2007-08-17
 
 * Fixed bugs in task reordering links

data/app/controllers/estimates_controller.rb

@@ -1,9 +1,10 @@
 class EstimatesController < ApplicationController
+  verify :method => :post, :redirect_to => ''
   
   def create
     if params[:id] && params[:estimate]
       @task = Task.find(params[:id])
-      @task.estimate(params[:estimate][:todo], user)
+      @task.estimate(params[:estimate][:todo])
       redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task_id => @task.id
     end
   end

data/app/controllers/user_controller.rb

@@ -167,6 +167,7 @@ class UserController < ApplicationController
   def generate_filled_in
     @user = User.find_by_id(params[:id]) || current_user || User.find_by_id(session[:user_id])
     @groups = Group.find(:all, :order => 'name')
+    @periods = @user.periods
     case request.method
     when :get
       render

data/app/models/period.rb

@@ -182,11 +182,11 @@ class Period < ActiveRecord::Base
     observed_todo_data = get_todo_data(recorded_dates)
     actual_todo_data = get_todo_data(recorded_dates, true)
     g.data("#{l :todo} (#{l :obs})", observed_todo_data)
-    g.data("#{l :calc}", actual_todo_data)
+    g.data("#{l :todo}", actual_todo_data)
     g.data(l(:done), get_work_data(recorded_dates)) if track_work?
     if previous_period = higher_item
-      g.data("#{l :previous} #{l :obs}", previous_period.get_todo_data(previous_period.dates))
-      g.data("#{l :calc}", previous_period.get_todo_data(previous_period.dates, true))
+      g.data("#{l :previous_abr} #{l :obs}", previous_period.get_todo_data(previous_period.dates))
+      g.data("#{l :previous_abr}", previous_period.get_todo_data(previous_period.dates, true))
     end
     
     if active?

data/app/views/layouts/_left_top.rhtml

@@ -10,7 +10,7 @@
       <% end %>
       | <%= link_to l(:backlogs), :controller => 'backlogs', :action => :list %>
 <!--      | <%= link_to l(:administration), :controller => 'administration', :action => :index %> -->
-      <% if user? %>| <%=user.email%><% end %>
+      <% if user? %>| <%=link_to user.email, :controller => 'user', :action => :edit%><% end %>
     </div>
     <div id="header">
       <%= error_messages_for :backlog, :user, :group, :period, :task, :work, :estimate %>

data/app/views/periods/_form.rhtml

@@ -14,15 +14,23 @@
 <% end %>
 </p>
 
-<%= hidden_field 'period', 'position' %>
 <% if @period.party %>
-<p><label for="period_position"><%=l :position%></label>:
-<%= @period.party.periods.last ? @period.party.periods.last.position + 1 : 1 %></p>
+  <p><label for="period_position"><%=l :position%></label>:
+  <% if @period.new_record? %>
+    <%= @period.party.periods.last ? @period.party.periods.last.position + 1 : 1 %></p>
+  <% else %>
+    <%= @period.position %></p>
+  <% end %>
 <% end %>
 
 <p><label for="period_start_on"><%=l :start_on%></label><br/>
-<% minimum_date = @period.higher_item ? @period.higher_item.end_on + 1  : Date.today %>
-<% maximum_date = @period.lower_item  ? @period.lower_item.start_on - 1 : Date.today + 5*365 %>
+<% if @period.party && @period.new_record? %>
+  <% minimum_date = @period.party.periods.last ? @period.party.periods.last.end_on + 1  : Date.today %>
+  <% maximum_date = Date.today + 5*365 %>
+<% else %>
+  <% minimum_date = @period.higher_item ? @period.higher_item.end_on + 1  : Date.today %>
+  <% maximum_date = @period.lower_item  ? @period.lower_item.start_on - 1 : Date.today + 5*365 %>
+<% end %>
 <%= text_field 'period', 'start_on', :size => 10, :value => @period.start_on ? @period.start_on.strftime('%Y-%m-%d') : nil %>
     <button id="trigger1">...</button>
     <script type="text/javascript">//<![CDATA[

data/app/views/user/edit.rhtml

@@ -11,17 +11,16 @@
     <h4><%=l :password %></h4>
   </div>
 
-    <%= start_form_tag_helper %>
-      <%= render_partial 'password', :submit => true %>
-    </form>
+  <%= start_form_tag_helper %>
+    <%= render_partial 'password', :submit => true %>
+  </form>
 
-    <%= start_form_tag_helper %>
-      <div class="user_delete">
-        <%= hidden_field 'user', 'form', :value => 'delete' %>
-        <%= submit_tag l(:delete) %>
-      </div>
-    </form>
-  </div>
+  <%= start_form_tag_helper %>
+    <div class="user_delete">
+      <%= hidden_field 'user', 'form', :value => 'delete' %>
+      <%= submit_tag l(:delete) %>
+    </div>
+  </form>
 </div>
 
 <div id="lfeature">
@@ -29,15 +28,33 @@
     <h4><%=l :groups %></h4>
   </div>
 
-<table>
-<% for @group in @groups %>
-  <tr>
-    <td><%=link_to h(@group.name), :controller => 'groups', :action => :edit, :id => @group %></td>
-    <td>
-      <% form_for :group, @group, :url => {:controller => 'groups', :action => :set_member, :id => @group, :user_id => @user.id} do %>
-        <%=check_box_tag :value, true, @group.users.include?(@user), :onchange => "form.submit()" %></td>
-      <% end %>
-  </tr>
-<% end %>
-</table>
+  <table>
+  <% for @group in @groups %>
+    <tr>
+      <td><%=link_to h(@group.name), :controller => 'groups', :action => :edit, :id => @group %></td>
+      <td>
+        <% form_for :group, @group, :url => {:controller => 'groups', :action => :set_member, :id => @group, :user_id => @user.id} do %>
+          <%=check_box_tag :value, true, @group.users.include?(@user), :onchange => "form.submit()" %>
+        <% end %>
+	  </td>
+    </tr>
+  <% end %>
+  </table>
 </div>
+
+<br clear="right"/>
+
+<div id="rfeature">
+  <div class="btitle">
+    <h4><%=l :periods %></h4>
+  </div>
+
+  <table>
+  <% for @period in @periods %>
+    <tr>
+      <td><%=link_to h(@period.name), :controller => 'periods', :action => :show, :id => @period %></td>
+    </tr>
+  <% end %>
+  </table>
+</div>
+

data/cruise_config.rb

@@ -0,0 +1,6 @@
+Project.configure do |project|
+  project.email_notifier.emails = ['uwe@datek.no', 'uwe@kubosch.no', 'donv@crusaders.no']
+  project.email_notifier.from = 'cruisecontrol@datek.no'
+
+  project.build_command = 'RAILS_ENV=test rake'
+end

data/lang/en.yaml

@@ -55,9 +55,11 @@ next: Next
 no_pending_tasks: There are no pending tasks in this period.
 password: Password
 period: Period
+periods: Periods
 position: Position
 postponed: Postponed
 previous: Previous
+previous_abr: Prev.
 projection: Projection
 reopen: Reopen task
 resolution: Resolution

data/lang/no.yaml

@@ -55,9 +55,11 @@ next: Neste
 no_pending_tasks: Det er ingen ventende oppgaver i denne perioden.
 password: Passord
 period: Periode
+periods: Perioder
 position: Posisjon
 postponed: Utsatt
 previous: Forrige
+previous_abr: Forrige
 projection: Projeksjon
 reopen: Gjenåpne
 resolution: Avslutningsmåte

data/lib/class_table_inheritance.rb

@@ -108,7 +108,16 @@ class ActiveRecord::Base
                 # then filter by sub_attributes
                 method_missing_super(method_symbol, parameters)
               else
-                #{proxy_class_name}.method_missing(method_symbol, parameters)
+                result = #{proxy_class_name}.method_missing(method_symbol, parameters)
+                if result
+                  if result.is_a? Array
+                    result.map {|entry| entry.base}
+                  else
+                    result = result.base
+                  end
+                else
+                  result
+                end
               end
             else
               method_missing_super(method_symbol, parameters)

data/test/functional/estimates_controller_test.rb

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'estimates_controller'
 
-# Re-raise errors caught by the controller.
 class EstimatesController; def rescue_action(e) raise e end; end
 
 class EstimatesControllerTest < Test::Unit::TestCase
@@ -9,10 +8,34 @@ class EstimatesControllerTest < Test::Unit::TestCase
     @controller = EstimatesController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+
+    @request.session[:user_id] = 1000001
+  end
+  
+  def test_create
+    count_before = Estimate.count
+    post :create,
+        "action"=>"create", 
+        "id"=>"1", 
+        "estimate"=>{"todo"=>"0"}
+    
+    assert_response :redirect
+    assert_redirected_to :controller => 'periods', :action => :show, :id => 1, :task_id => 1
+
+    assert_equal count_before +1 , Estimate.count
   end
+  
+  def test_create_get_is_redirected_to_root
+    count_before = Estimate.count
+    get :create,
+        "action"=>"create", 
+        "id"=>"1", 
+        "estimate"=>{"todo"=>"0"}
+    
+    assert_response :redirect
+    assert_redirected_to :controller => 'backlogs', :action => :index
 
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+    assert_equal count_before, Estimate.count
   end
+  
 end

data/test/functional/groups_controller_test.rb

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'groups_controller'
 
-# Re-raise errors caught by the controller.
 class GroupsController; def rescue_action(e) raise e end; end
 
 class GroupsControllerTest < Test::Unit::TestCase

data/test/unit/user_test.rb

@@ -134,6 +134,11 @@ class UserTest < Test::Unit::TestCase
   #    assert !u.save
   #  end
   
+  def test_find_by
+    user = User.find_by_email('tesla@example.com')
+    assert_equal User, user.class
+  end
+  
   private
   
   # TODO (uwe): This method should be removed

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 date: 2007-08-17 00:00:00 +02:00
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.
 require_paths: 
@@ -227,7 +227,9 @@ files:
 - config/environments/datek_production.rb
 - LICENSE_LOCALIZATION
 - README.txt
+- doc
 - Manifest.txt
+- cruise_config.rb
 - vendor
 - vendor/plugins
 - vendor/plugins/activerecord_foreign_key_extensions