kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added all list and boolean custom data fields to the Time Report. #4077

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2951 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis 2009-10-21 22:34:57 +00:00
parent 37d401ac58
commit 2e0cbd2840
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/timelog_controller.rb
View File

@ -67,7 +67,14 @@ class TimelogController < ApplicationController
:format => cf.field_format, :format => cf.field_format,
:label => cf.name} :label => cf.name}
end end
# Add list and boolean time entry activity custom fields
TimeEntryActivityCustomField.find(:all).select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
@available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Enumeration' AND c.customized_id = #{TimeEntry.table_name}.activity_id)",
:format => cf.field_format,
:label => cf.name}
end
@criterias = params[:criterias] || [] @criterias = params[:criterias] || []
@criterias = @criterias.select{|criteria| @available_criterias.has_key? criteria} @criterias = @criterias.select{|criteria| @available_criterias.has_key? criteria}
@criterias.uniq! @criterias.uniq!

6
test/functional/timelog_controller_test.rb
View File

@ -238,12 +238,12 @@ class TimelogControllerTest < ActionController::TestCase
end end
def test_report_custom_field_criteria def test_report_custom_field_criteria
get :report, :project_id => 1, :criterias => ['project', 'cf_1'] get :report, :project_id => 1, :criterias => ['project', 'cf_1', 'cf_7']
assert_response :success assert_response :success
assert_template 'report' assert_template 'report'
assert_not_nil assigns(:total_hours) assert_not_nil assigns(:total_hours)
assert_not_nil assigns(:criterias) assert_not_nil assigns(:criterias)
assert_equal 2, assigns(:criterias).size assert_equal 3, assigns(:criterias).size
assert_equal "162.90", "%.2f" % assigns(:total_hours) assert_equal "162.90", "%.2f" % assigns(:total_hours)
# Custom field column # Custom field column
assert_tag :tag => 'th', :content => 'Database' assert_tag :tag => 'th', :content => 'Database'
@ -252,6 +252,8 @@ class TimelogControllerTest < ActionController::TestCase
:sibling => { :tag => 'td', :attributes => { :class => 'hours' }, :sibling => { :tag => 'td', :attributes => { :class => 'hours' },
:child => { :tag => 'span', :attributes => { :class => 'hours hours-int' }, :child => { :tag => 'span', :attributes => { :class => 'hours hours-int' },
:content => '1' }} :content => '1' }}
# Second custom field column
assert_tag :tag => 'th', :content => 'Billable'
end end
def test_report_one_criteria_no_result def test_report_one_criteria_no_result