jro_apps/redmine Commit - r10741:d6ecfcf50cfa

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

Jean-Philippe Lang -

r10741:d6ecfcf50cfa

parent child

Context file:

r10741:d6ecfcf50cfa

Collapse all files

app/views/timelog/_list.html.erb +1 -1

                 :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
             </th>
             <%= 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('project', :caption => l(:label_project)) %>
             <%= sort_header_tag('issue', :caption => l(:label_issue), :default_order => 'desc') %>

lib/redmine/helpers/time_report.rb +2 -2

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

test/functional/time_entry_reports_controller_test.rb +13 -13

               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)
               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)
               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)
               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
               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
                 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')
                 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
                   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')

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages