Просмотр исходного кода

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

Rolf Schmidt 2 лет назад
Родитель
Сommit
489d2e0a19
1 измененных файлов с 4 добавлено и 3 удалено
  1. 4 3
      lib/excel_sheet.rb

+ 4 - 3
lib/excel_sheet.rb

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