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

2 files changed, 18 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 %>
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index ab4ed364e..f23c9601d 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -1418,4 +1418,19 @@ class TimelogControllerTest < Redmine::ControllerTest
       assert_select '+ span.count', :text => '2'
     end
   end
+
+  def test_index_with_inline_issue_long_text_custom_field_column
+    field = IssueCustomField.create!(:name => 'Long text', :field_format => 'text', :full_width_layout => '1',
+      :tracker_ids => [1], :is_for_all => true)
+    issue = Issue.find(1)
+    issue.custom_field_values = {field.id => 'This is a long text'}
+    issue.save!
+
+    get :index, :params => {
+        :set_filter => 1,
+        :c => ['subject', 'description', "issue.cf_#{field.id}"]
+      }
+    assert_response :success
+    assert_select "td.issue_cf_#{field.id}", :text => 'This is a long text'
+  end
 end