Project

General

Profile

Defect #33186 » use-field_activity.patch

Go MAEDA, 2020-03-23 15:37

View differences:

app/views/my/blocks/_timelog.html.erb
31 31
<%= form_tag({}, :data => {:cm_url => time_entries_context_menu_path}) do %>
32 32
<table class="list time-entries odd-even">
33 33
<thead><tr>
34
<th><%= l(:label_activity) %></th>
34
<th><%= l(:field_activity) %></th>
35 35
<th><%= l(:label_project) %></th>
36 36
<th><%= l(:field_comments) %></th>
37 37
<th><%= l(:field_hours) %></th>
lib/redmine/helpers/time_report.rb
124 124
                                              :label => :label_tracker},
125 125
                                 'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
126 126
                                               :klass => TimeEntryActivity,
127
                                               :label => :label_activity},
127
                                               :label => :field_activity},
128 128
                                 'issue' => {:sql => "#{TimeEntry.table_name}.issue_id",
129 129
                                             :klass => Issue,
130 130
                                             :label => :label_issue}
(1-1/2)