jro_apps/redmine Commit - r8606:79b12c73d9ac

Display of multi custom fields....

Jean-Philippe Lang -

r8606:79b12c73d9ac

parent child

Context file:

r8606:79b12c73d9ac

app/helpers/custom_fields_helper.rb +1 -1

               # Return a string used to display a custom value
               def format_value(value, field_format)
                 if value.is_a?(Array)
-                  value.collect {|v| format_value(v, field_format)}.join(', ')
+                  value.collect {|v| format_value(v, field_format)}.compact.sort.join(', ')
                 else
                   Redmine::CustomFieldFormat.format_value(value, field_format)
                 end

app/helpers/issues_helper.rb +1 -1

                   issues.each do |issue|
                     col_values = columns.collect do |column|
                       s = if column.is_a?(QueryCustomFieldColumn)
-                        cv = issue.custom_values.detect {|v| v.custom_field_id == column.custom_field.id}
+                        cv = issue.custom_field_values.detect {|v| v.custom_field_id == column.custom_field.id}
                         show_value(cv)
                       else
                         value = issue.send(column.name)

app/helpers/timelog_helper.rb +1 -1

                               entry.hours.to_s.gsub('.', decimal_separator),
                               entry.comments
                               ]
-                    fields += custom_fields.collect {|f| show_value(entry.custom_value_for(f)) }
+                    fields += custom_fields.collect {|f| show_value(entry.custom_field_values.detect {|v| v.custom_field_id == f.id}) }
                     csv << fields.collect {|c| Redmine::CodesetUtil.from_utf8(
                                                  c.to_s,

app/views/versions/_overview.html.erb +1 -1

             <% end %>
             <p><%=h version.description %></p>
-            <% if version.custom_values.any? %>
+            <% if version.custom_field_values.any? %>
             <ul>
               <% version.custom_field_values.each do |custom_value| %>
                 <% if custom_value.value.present? %>

lib/redmine/export/pdf.rb +1 -1

                       # fetch all the row values
                       col_values = query.columns.collect do |column|
                         s = if column.is_a?(QueryCustomFieldColumn)
-                          cv = issue.custom_values.detect {|v| v.custom_field_id == column.custom_field.id}
+                          cv = issue.custom_field_values.detect {|v| v.custom_field_id == column.custom_field.id}
                           show_value(cv)
                         else
                           value = issue.send(column.name)

test/functional/issues_controller_test.rb +13 -1

                 assert_equal assigns(:query).available_columns.size + 1, lines[0].split(',').size
               end
+              def test_index_csv_with_multi_column_field
+                CustomField.find(1).update_attribute :multiple, true
+                issue = Issue.find(1)
+                issue.custom_field_values = {1 => ['MySQL', 'Oracle']}
+                issue.save!
+                get :index, :format => 'csv', :columns => 'all'
+                assert_response :success
+                lines = @response.body.chomp.split("\n")
+                assert lines.detect {|line| line.include?('"MySQL, Oracle"')}
+              end
               def test_index_csv_big_5
                 with_settings :default_language => "zh-TW" do
                   str_utf8  = "\xe4\xb8\x80\xe6\x9c\x88"
                 assert_response :success
                 # TODO: should display links
-                assert_tag :td, :content => 'John Smith, Dave Lopper'
+                assert_tag :td, :content => 'Dave Lopper, John Smith'
               end
               def test_show_atom

test/functional/timelog_controller_test.rb +12 0

@@ -563,6 +563,18 class TimelogControllerTest < ActionController::TestCase
563	assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\",\"\"\n")	563	assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\",\"\"\n")
564	end	564	end
565		565
		566	def test_index_csv_export_with_multi_custom_field
		567	field = TimeEntryCustomField.create!(:name => 'Test', :field_format => 'list',
		568	:multiple => true, :possible_values => ['value1', 'value2'])
		569	entry = TimeEntry.find(1)
		570	entry.custom_field_values = {field.id => ['value1', 'value2']}
		571	entry.save!
		572
		573	get :index, :project_id => 1, :format => 'csv'
		574	assert_response :success
		575	assert_include '"value1, value2"', @response.body
		576	end
		577
566	def test_csv_big_5	578	def test_csv_big_5
567	user = User.find_by_id(3)	579	user = User.find_by_id(3)
568	user.language = "zh-TW"	580	user.language = "zh-TW"

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