kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename the Member column to User on the time entries list. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10968 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-12-09 18:09:44 +00:00
parent f8895a7cdd
commit d6ecfcf50c
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/timelog/_list.html.erb
View File

@ -11,7 +11,7 @@
:title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %> :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
</th> </th>
<%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %> <%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
<%= sort_header_tag('user', :caption => l(:label_member)) %> <%= sort_header_tag('user', :caption => l(:label_user)) %>
<%= sort_header_tag('activity', :caption => l(:label_activity)) %> <%= sort_header_tag('activity', :caption => l(:label_activity)) %>
<%= sort_header_tag('project', :caption => l(:label_project)) %> <%= sort_header_tag('project', :caption => l(:label_project)) %>
<%= sort_header_tag('issue', :caption => l(:label_issue), :default_order => 'desc') %> <%= sort_header_tag('issue', :caption => l(:label_issue), :default_order => 'desc') %>

4
lib/redmine/helpers/time_report.rb
View File

@ -110,9 +110,9 @@ module Redmine
'category' => {:sql => "#{Issue.table_name}.category_id", 'category' => {:sql => "#{Issue.table_name}.category_id",
:klass => IssueCategory, :klass => IssueCategory,
:label => :field_category}, :label => :field_category},
'member' => {:sql => "#{TimeEntry.table_name}.user_id", 'user' => {:sql => "#{TimeEntry.table_name}.user_id",
:klass => User, :klass => User,
:label => :label_member}, :label => :label_user},
'tracker' => {:sql => "#{Issue.table_name}.tracker_id", 'tracker' => {:sql => "#{Issue.table_name}.tracker_id",
:klass => Tracker, :klass => Tracker,
:label => :label_tracker}, :label => :label_tracker},

26
test/functional/time_entry_reports_controller_test.rb
View File

@ -90,7 +90,7 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
end end
def test_report_two_criteria def test_report_two_criteria
get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criteria => ["member", "activity"] get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criteria => ["user", "activity"]
assert_response :success assert_response :success
assert_template 'report' assert_template 'report'
assert_not_nil assigns(:report) assert_not_nil assigns(:report)
@ -108,7 +108,7 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
end end
def test_report_one_day def test_report_one_day
get :report, :project_id => 1, :columns => 'day', :from => "2007-03-23", :to => "2007-03-23", :criteria => ["member", "activity"] get :report, :project_id => 1, :columns => 'day', :from => "2007-03-23", :to => "2007-03-23", :criteria => ["user", "activity"]
assert_response :success assert_response :success
assert_template 'report' assert_template 'report'
assert_not_nil assigns(:report) assert_not_nil assigns(:report)
@ -116,7 +116,7 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
end end
def test_report_at_issue_level def test_report_at_issue_level
get :report, :project_id => 1, :issue_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criteria => ["member", "activity"] get :report, :project_id => 1, :issue_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criteria => ["user", "activity"]
assert_response :success assert_response :success
assert_template 'report' assert_template 'report'
assert_not_nil assigns(:report) assert_not_nil assigns(:report)
@ -161,12 +161,12 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
def test_report_all_projects_csv_export def test_report_all_projects_csv_export
get :report, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30", get :report, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30",
:criteria => ["project", "member", "activity"], :format => "csv" :criteria => ["project", "user", "activity"], :format => "csv"
assert_response :success assert_response :success
assert_equal 'text/csv; header=present', @response.content_type assert_equal 'text/csv; header=present', @response.content_type
lines = @response.body.chomp.split("\n") lines = @response.body.chomp.split("\n")
# Headers # Headers
assert_equal 'Project,Member,Activity,2007-3,2007-4,Total', lines.first assert_equal 'Project,User,Activity,2007-3,2007-4,Total', lines.first
# Total row # Total row
assert_equal 'Total,"","",154.25,8.65,162.90', lines.last assert_equal 'Total,"","",154.25,8.65,162.90', lines.last
end end
@ -174,12 +174,12 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
def test_report_csv_export def test_report_csv_export
get :report, :project_id => 1, :columns => 'month', get :report, :project_id => 1, :columns => 'month',
:from => "2007-01-01", :to => "2007-06-30", :from => "2007-01-01", :to => "2007-06-30",
:criteria => ["project", "member", "activity"], :format => "csv" :criteria => ["project", "user", "activity"], :format => "csv"
assert_response :success assert_response :success
assert_equal 'text/csv; header=present', @response.content_type assert_equal 'text/csv; header=present', @response.content_type
lines = @response.body.chomp.split("\n") lines = @response.body.chomp.split("\n")
# Headers # Headers
assert_equal 'Project,Member,Activity,2007-3,2007-4,Total', lines.first assert_equal 'Project,User,Activity,2007-3,2007-4,Total', lines.first
# Total row # Total row
assert_equal 'Total,"","",154.25,8.65,162.90', lines.last assert_equal 'Total,"","",154.25,8.65,162.90', lines.last
end end
@ -211,12 +211,12 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
get :report, :project_id => 1, :columns => 'day', get :report, :project_id => 1, :columns => 'day',
:from => "2011-11-11", :to => "2011-11-11", :from => "2011-11-11", :to => "2011-11-11",
:criteria => ["member"], :format => "csv" :criteria => ["user"], :format => "csv"
assert_response :success assert_response :success
assert_equal 'text/csv; header=present', @response.content_type assert_equal 'text/csv; header=present', @response.content_type
lines = @response.body.chomp.split("\n") lines = @response.body.chomp.split("\n")
# Headers # Headers
s1 = "\xa6\xa8\xad\xfb,2011-11-11,\xc1`\xadp" s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xc1`\xadp"
s2 = "\xc1`\xadp" s2 = "\xc1`\xadp"
if s1.respond_to?(:force_encoding) if s1.respond_to?(:force_encoding)
s1.force_encoding('Big5') s1.force_encoding('Big5')
@ -262,12 +262,12 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
get :report, :project_id => 1, :columns => 'day', get :report, :project_id => 1, :columns => 'day',
:from => "2011-11-11", :to => "2011-11-11", :from => "2011-11-11", :to => "2011-11-11",
:criteria => ["member"], :format => "csv" :criteria => ["user"], :format => "csv"
assert_response :success assert_response :success
assert_equal 'text/csv; header=present', @response.content_type assert_equal 'text/csv; header=present', @response.content_type
lines = @response.body.chomp.split("\n") lines = @response.body.chomp.split("\n")
# Headers # Headers
s1 = "\xa6\xa8\xad\xfb,2011-11-11,\xc1`\xadp" s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xc1`\xadp"
if s1.respond_to?(:force_encoding) if s1.respond_to?(:force_encoding)
s1.force_encoding('Big5') s1.force_encoding('Big5')
end end
@ -303,12 +303,12 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
get :report, :project_id => 1, :columns => 'day', get :report, :project_id => 1, :columns => 'day',
:from => "2011-11-11", :to => "2011-11-11", :from => "2011-11-11", :to => "2011-11-11",
:criteria => ["member"], :format => "csv" :criteria => ["user"], :format => "csv"
assert_response :success assert_response :success
assert_equal 'text/csv; header=present', @response.content_type assert_equal 'text/csv; header=present', @response.content_type
lines = @response.body.chomp.split("\n") lines = @response.body.chomp.split("\n")
# Headers # Headers
s1 = "Membre;2011-11-11;Total" s1 = "Utilisateur;2011-11-11;Total"
s2 = "Total" s2 = "Total"
if s1.respond_to?(:force_encoding) if s1.respond_to?(:force_encoding)
s1.force_encoding('ISO-8859-1') s1.force_encoding('ISO-8859-1')