Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-05-06 19:37:31 +02:00
Code Issues Packages Projects Releases Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

26
test/functional/time_entry_reports_controller_test.rb
View File

@@ -90,7 +90,7 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
end
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_template 'report'
assert_not_nil assigns(:report)
@@ -108,7 +108,7 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
end
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_template 'report'
assert_not_nil assigns(:report)
@@ -116,7 +116,7 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
end
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_template 'report'
assert_not_nil assigns(:report)
@@ -161,12 +161,12 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
def test_report_all_projects_csv_export
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_equal 'text/csv; header=present', @response.content_type
lines = @response.body.chomp.split("\n")
# 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
assert_equal 'Total,"","",154.25,8.65,162.90', lines.last
end
@@ -174,12 +174,12 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
def test_report_csv_export
get :report, :project_id => 1, :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_equal 'text/csv; header=present', @response.content_type
lines = @response.body.chomp.split("\n")
# 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
assert_equal 'Total,"","",154.25,8.65,162.90', lines.last
end
@@ -211,12 +211,12 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
get :report, :project_id => 1, :columns => 'day',
:from => "2011-11-11", :to => "2011-11-11",
:criteria => ["member"], :format => "csv"
:criteria => ["user"], :format => "csv"
assert_response :success
assert_equal 'text/csv; header=present', @response.content_type
lines = @response.body.chomp.split("\n")
# Headers
s1 = "\xa6\xa8\xad\xfb,2011-11-11,\xc1`\xadp"
s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xc1`\xadp"
s2 = "\xc1`\xadp"
if s1.respond_to?(:force_encoding)
s1.force_encoding('Big5')
@@ -262,12 +262,12 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
get :report, :project_id => 1, :columns => 'day',
:from => "2011-11-11", :to => "2011-11-11",
:criteria => ["member"], :format => "csv"
:criteria => ["user"], :format => "csv"
assert_response :success
assert_equal 'text/csv; header=present', @response.content_type
lines = @response.body.chomp.split("\n")
# 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)
s1.force_encoding('Big5')
end
@@ -303,12 +303,12 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
get :report, :project_id => 1, :columns => 'day',
:from => "2011-11-11", :to => "2011-11-11",
:criteria => ["member"], :format => "csv"
:criteria => ["user"], :format => "csv"
assert_response :success
assert_equal 'text/csv; header=present', @response.content_type
lines = @response.body.chomp.split("\n")
# Headers
s1 = "Membre;2011-11-11;Total"
s1 = "Utilisateur;2011-11-11;Total"
s2 = "Total"
if s1.respond_to?(:force_encoding)
s1.force_encoding('ISO-8859-1')