diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 1c0f26bff..eb7b00850 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -108,7 +108,6 @@ Layout/ElseAlignment: - 'app/helpers/attachments_helper.rb' - 'app/helpers/queries_helper.rb' - 'app/models/issue_query.rb' - - 'lib/redmine/export/pdf/issues_pdf_helper.rb' # Cop supports --auto-correct. Layout/EmptyLineAfterGuardClause: diff --git a/lib/redmine/export/pdf/issues_pdf_helper.rb b/lib/redmine/export/pdf/issues_pdf_helper.rb index 6f86e1d55..8b1e59ae2 100644 --- a/lib/redmine/export/pdf/issues_pdf_helper.rb +++ b/lib/redmine/export/pdf/issues_pdf_helper.rb @@ -369,27 +369,28 @@ module Redmine # fetch row values def fetch_row_values(issue, query, level) query.inline_columns.collect do |column| - s = if column.is_a?(QueryCustomFieldColumn) - cv = issue.visible_custom_field_values.detect {|v| v.custom_field_id == column.custom_field.id} - show_value(cv, false) - else - value = issue.send(column.name) - case column.name - when :subject - value = " " * level + value - when :attachments - value = value.to_a.map {|a| a.filename}.join("\n") - end - if value.is_a?(Date) - format_date(value) - elsif value.is_a?(Time) - format_time(value) - elsif value.is_a?(Float) - sprintf "%.2f", value + s = + if column.is_a?(QueryCustomFieldColumn) + cv = issue.visible_custom_field_values.detect {|v| v.custom_field_id == column.custom_field.id} + show_value(cv, false) else - value + value = issue.send(column.name) + case column.name + when :subject + value = " " * level + value + when :attachments + value = value.to_a.map {|a| a.filename}.join("\n") + end + if value.is_a?(Date) + format_date(value) + elsif value.is_a?(Time) + format_time(value) + elsif value.is_a?(Float) + sprintf "%.2f", value + else + value + end end - end s.to_s end end