jro_apps/redmine Commit - r5212:5823481d6ef0

Wrap text custom fields in the issue list (#8064)....

Jean-Philippe Lang -

r5212:5823481d6ef0

parent child

Context file:

r5212:5823481d6ef0

app/models/query.rb +8 0

               def value(issue)
                 issue.send name
               end
+              def css_classes
+                name
+              end
             end
             class QueryCustomFieldColumn < QueryColumn
                 cv = issue.custom_values.detect {|v| v.custom_field_id == @cf.id}
                 cv && @cf.cast_value(cv.value)
               end
+              def css_classes
+                @css_classes ||= "#{name} #{@cf.field_format}"
+              end
             end
             class Query < ActiveRecord::Base

app/views/issues/_list.rhtml +1 -1

             	<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
             	  <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
             		<td class="id"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
-                    <% query.columns.each do |column| %><%= content_tag 'td', column_content(column, issue), :class => column.name %><% end %>
+                    <% query.columns.each do |column| %><%= content_tag 'td', column_content(column, issue), :class => column.css_classes %><% end %>
             	</tr>
             	<% end -%>
             	</tbody>

public/stylesheets/application.css +2 -1

             tr.project.idnt-9 td.name {padding-left: 12.5em;}
             tr.issue { text-align: center; white-space: nowrap; }
-            tr.issue td.subject, tr.issue td.category, td.assigned_to { white-space: normal; }
+            tr.issue td.subject, tr.issue td.category, td.assigned_to, tr.issue td.string, tr.issue td.text { white-space: normal; }
             tr.issue td.subject { text-align: left; }
             tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
+            tr.issue td.
             tr.issue.idnt td.subject a {background: url(../images/bullet_arrow_right.png) no-repeat 0 50%; padding-left: 16px;}
             tr.issue.idnt-1 td.subject {padding-left: 0.5em;}

test/functional/issues_controller_test.rb +15 0

@@ -261,6 +261,21 class IssuesControllerTest < ActionController::TestCase
261	assert_kind_of Array, session[:query][:column_names]	261	assert_kind_of Array, session[:query][:column_names]
262	assert_equal columns, session[:query][:column_names].map(&:to_s)	262	assert_equal columns, session[:query][:column_names].map(&:to_s)
263	end	263	end
		264
		265	def test_index_with_custom_field_column
		266	columns = %w(tracker subject cf_2)
		267	get :index, :set_filter => 1, :c => columns
		268	assert_response :success
		269
		270	# query should use specified columns
		271	query = assigns(:query)
		272	assert_kind_of Query, query
		273	assert_equal columns, query.column_names.map(&:to_s)
		274
		275	assert_tag :td,
		276	:attributes => {:class => 'cf_2 string'},
		277	:ancestor => {:tag => 'table', :attributes => {:class => /issues/}}
		278	end
264		279
265	def test_show_by_anonymous	280	def test_show_by_anonymous
266	get :show, :id => 1	281	get :show, :id => 1

General Comments 0

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

No TODOs yet

	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