From e088d50f5d11f2d35fd90e8b374be04e06f0eedf Mon Sep 17 00:00:00 2001 From: Vishwas Babu A J Date: Mon, 15 Jun 2015 15:21:11 -0700 Subject: [PATCH] MIFOSX-2074 --- .../infrastructure/dataqueries/api/RunreportsApiResource.java | 4 ++-- .../dataqueries/service/ReadReportingServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/api/RunreportsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/api/RunreportsApiResource.java index 879956b83..3d773cbd3 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/api/RunreportsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/api/RunreportsApiResource.java @@ -59,7 +59,7 @@ public class RunreportsApiResource { @GET @Path("{reportName}") @Consumes({ MediaType.APPLICATION_JSON }) - @Produces({ MediaType.APPLICATION_JSON, "application/x-msdownload", "application/vnd.ms-excel", "application/pdf", "text/html" }) + @Produces({ MediaType.APPLICATION_JSON, "text/csv", "application/vnd.ms-excel", "application/pdf", "text/html" }) public Response runReport(@PathParam("reportName") final String reportName, @Context final UriInfo uriInfo) { final MultivaluedMap queryParams = uriInfo.getQueryParameters(); @@ -128,7 +128,7 @@ public class RunreportsApiResource { final StreamingOutput result = this.readExtraDataAndReportingService .retrieveReportCSV(reportName, parameterTypeValue, reportParams); - return Response.ok().entity(result).type("application/x-msdownload") + return Response.ok().entity(result).type("text/csv") .header("Content-Disposition", "attachment;filename=" + reportName.replaceAll(" ", "") + ".csv").build(); } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingServiceImpl.java index 8a2233d0f..4e335d7f7 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingServiceImpl.java @@ -288,7 +288,7 @@ public class ReadReportingServiceImpl implements ReadReportingService { if ("CSV".equalsIgnoreCase(outputType)) { CSVReportUtil.createCSV(masterReport, baos, "UTF-8"); - return Response.ok().entity(baos.toByteArray()).type("application/x-msdownload") + return Response.ok().entity(baos.toByteArray()).type("text/csv") .header("Content-Disposition", "attachment;filename=" + reportName.replaceAll(" ", "") + ".csv").build(); }