Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #4103 - Reporting export file shows empty fields in selected columns when "custom sort option" is enabled.

Browse source
This commit is contained in:
Rolf Schmidt 2022-05-31 15:18:20 +02:00
parent 62ae0e9944
commit bb80177a02
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/excel_sheet.rb
View file

@ -156,10 +156,11 @@ class ExcelSheet
record record
end end
case object[:data_type] case object[:data_type]
when 'boolean', 'select' when 'boolean', %r{^(multi|tree_)?select$}
if object[:data_option] && object[:data_option]['options'] && object[:data_option]['options'][value] if object[:data_option].present? && object[:data_option]['options'].present?
value = object[:data_option]['options'][value] value = ObjectManager::Attribute.data_options_hash(object[:data_option]['options'])[value]
end end
@worksheet.write_string(@current_row, @current_column, value) if value.present? @worksheet.write_string(@current_row, @current_column, value) if value.present?
when 'datetime' when 'datetime'
@worksheet.write_date_time(@current_row, @current_column, timestamp_in_localtime(value), @format_time) if value.present? @worksheet.write_date_time(@current_row, @current_column, timestamp_in_localtime(value), @format_time) if value.present?