Skip to content

Commit

Permalink
Fixes a error with IssueController change of Redmine r16387. refs #30
Browse files Browse the repository at this point in the history
  • Loading branch information
two-pack committed Mar 12, 2017
1 parent f22ed94 commit d4df8aa
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 17 deletions.
22 changes: 5 additions & 17 deletions lib/issues_controller_patch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,14 @@ def query_issues
end

def index_with_xlsx
if params[:format] != 'xlsx'
begin
return index_without_xlsx
rescue ActionController::UnknownFormat => e
if params[:format] != 'xlsx'
raise e
end
end

retrieve_query
sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
sort_update(@query.sortable_columns)
@query.sort_criteria = sort_criteria.to_a

@limit = Setting.issues_export_limit.to_i
if params[:columns] == 'all'
@query.column_names = @query.available_inline_columns.map(&:name)
end

@issue_count = @query.issue_count
@issue_pages = Redmine::Pagination::Paginator.new @issue_count, @limit, params['page']
@offset ||= @issue_pages.offset
@issues = query_issues
@issue_count_by_group = @query.issue_count_by_group

send_data(query_to_xlsx(@issues, @query, params), :type => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;', :filename => 'issues.xlsx')
end
end
Expand Down
8 changes: 8 additions & 0 deletions test/functional/issues_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -215,4 +215,12 @@ def test_index_xlsx_fr
assert_equal 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;', @response.content_type
end
end

def test_index_xlsx_when_specified_unknown_format
begin
get :index, :format => 'unknownformat'
rescue ActionController::UnknownFormat => e
pass
end
end
end

0 comments on commit d4df8aa

Please sign in to comment.