##// END OF EJS Templates
Fixed Iconv::IllegalSequence errors in csv exports...
Jean-Philippe Lang -
r567:600018d5adfd
parent child
Show More
@@ -325,7 +325,7 class ProjectsController < ApplicationController
325 for custom_field in @project.all_custom_fields
325 for custom_field in @project.all_custom_fields
326 headers << custom_field.name
326 headers << custom_field.name
327 end
327 end
328 csv << headers.collect {|c| ic.iconv(c) }
328 csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
329 # csv lines
329 # csv lines
330 @issues.each do |issue|
330 @issues.each do |issue|
331 fields = [issue.id, issue.status.name,
331 fields = [issue.id, issue.status.name,
@@ -344,7 +344,7 class ProjectsController < ApplicationController
344 for custom_field in @project.all_custom_fields
344 for custom_field in @project.all_custom_fields
345 fields << (show_value issue.custom_value_for(custom_field))
345 fields << (show_value issue.custom_value_for(custom_field))
346 end
346 end
347 csv << fields.collect {|c| ic.iconv(c.to_s) }
347 csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
348 end
348 end
349 end
349 end
350 export.rewind
350 export.rewind
@@ -61,7 +61,7 private
61 l(:field_hours),
61 l(:field_hours),
62 l(:field_comments)
62 l(:field_comments)
63 ]
63 ]
64 csv << headers.collect {|c| ic.iconv(c) }
64 csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
65 # csv lines
65 # csv lines
66 @entries.each do |entry|
66 @entries.each do |entry|
67 fields = [l_date(entry.spent_on),
67 fields = [l_date(entry.spent_on),
@@ -71,7 +71,7 private
71 entry.hours,
71 entry.hours,
72 entry.comments
72 entry.comments
73 ]
73 ]
74 csv << fields.collect {|c| ic.iconv(c.to_s) }
74 csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
75 end
75 end
76 end
76 end
77 export.rewind
77 export.rewind
General Comments 0
You need to be logged in to leave comments. Login now