Skip to content

O
OHR Support
Commit 600018d5 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

Fixed Iconv::IllegalSequence errors in csv exports 

git-svn-id: http://redmine.rubyforge.org/svn/trunk@570 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent ec44c94c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
app/controllers/projects_controller.rb
View file @ 600018d5
......@@ -325,7 +325,7 @@ class ProjectsController < ApplicationController
for custom_field in @project.all_custom_fields
headers << custom_field.name
end
csv << headers.collect {|c| ic.iconv(c) }
csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
# csv lines
@issues.each do |issue|
fields = [issue.id, issue.status.name,
......@@ -344,7 +344,7 @@ class ProjectsController < ApplicationController
for custom_field in @project.all_custom_fields
fields << (show_value issue.custom_value_for(custom_field))
end
csv << fields.collect {|c| ic.iconv(c.to_s) }
csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
end
end
export.rewind
......
app/controllers/timelog_controller.rb
View file @ 600018d5
......@@ -61,7 +61,7 @@ private
l(:field_hours),
l(:field_comments)
]
csv << headers.collect {|c| ic.iconv(c) }
csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
# csv lines
@entries.each do |entry|
fields = [l_date(entry.spent_on),
......@@ -71,7 +71,7 @@ private
entry.hours,
entry.comments
]
csv << fields.collect {|c| ic.iconv(c.to_s) }
csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
end
end
export.rewind
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment