diff options
| author | Go MAEDA <maeda@farend.jp> | 2020-01-12 06:39:56 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2020-01-12 06:39:56 +0000 |
| commit | bd0909310afa3825de1414af51ffda54967acb49 (patch) | |
| tree | 473cedba9c852b2acf8bc864b0bb8b937ab759ee /app/views/timelog/_list.html.erb | |
| parent | 10ed8d27e47da893c5533cffea2e8fdffccf2de1 (diff) | |
| download | redmine-bd0909310afa3825de1414af51ffda54967acb49.tar.gz redmine-bd0909310afa3825de1414af51ffda54967acb49.zip | |
Merged r19419 from trunk to 4.1-stable (#32768).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19420 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/timelog/_list.html.erb')
| -rw-r--r-- | app/views/timelog/_list.html.erb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/timelog/_list.html.erb b/app/views/timelog/_list.html.erb index b3146c28b..582d1208c 100644 --- a/app/views/timelog/_list.html.erb +++ b/app/views/timelog/_list.html.erb @@ -50,11 +50,12 @@ <%= link_to_context_menu %> </td> </tr> + <% @query.block_columns.each do |column| - if (text = column_content(column, issue)) && text.present? -%> + if (text = column_content(column, entry)) && text.present? -%> <tr class="<%= current_cycle %>"> <td colspan="<%= @query.inline_columns.size + 1 %>" class="<%= column.css_classes %>"> - <% if query.block_columns.count > 1 %> + <% if @query.block_columns.count > 1 %> <span><%= column.caption %></span> <% end %> <%= text %> |