Skip to content

Added ContentDisposition only if it is not already specified #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added ContentDisposition only if it is not already specified #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 29 additions & 25 deletions src/WebApiContrib.Formatting.Xlsx/XlsxMediaTypeFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,31 +96,35 @@ public override void SetDefaultContentHeaders(Type type, HttpContentHeaders head
rawUri = rawUri.Substring(0, queryStringIndex);
}

string fileName;

// Look for ExcelDocumentAttribute on class.
var itemType = util.GetEnumerableItemType(type);
var excelDocumentAttribute = util.GetAttribute<ExcelDocumentAttribute>(itemType ?? type);

if (excelDocumentAttribute != null && !string.IsNullOrEmpty(excelDocumentAttribute.FileName))
{
// If attribute exists with file name defined, use that.
fileName = excelDocumentAttribute.FileName;
}
else
{
// Otherwise, use either the URL file name component or just "data".
fileName = System.Web.VirtualPathUtility.GetFileName(rawUri) ?? "data";
}

// Add XLSX extension if not present.
if (!fileName.EndsWith("xlsx", StringComparison.CurrentCultureIgnoreCase)) fileName += ".xlsx";

// Set content disposition to use this file name.
headers.ContentDisposition = new ContentDispositionHeaderValue("inline")
{ FileName = fileName };

base.SetDefaultContentHeaders(type, headers, mediaType);
if (headers.ContentDisposition == null)
{

string fileName;

// Look for ExcelDocumentAttribute on class.
var itemType = util.GetEnumerableItemType(type);
var excelDocumentAttribute = util.GetAttribute<ExcelDocumentAttribute>(itemType ?? type);

if (excelDocumentAttribute != null && !string.IsNullOrEmpty(excelDocumentAttribute.FileName))
{
// If attribute exists with file name defined, use that.
fileName = excelDocumentAttribute.FileName;
}
else
{
// Otherwise, use either the URL file name component or just "data".
fileName = System.Web.VirtualPathUtility.GetFileName(rawUri) ?? "data";
}

// Add XLSX extension if not present.
if (!fileName.EndsWith("xlsx", StringComparison.CurrentCultureIgnoreCase)) fileName += ".xlsx";

// Set content disposition to use this file name.
headers.ContentDisposition = new ContentDispositionHeaderValue("inline")
{FileName = fileName};
}

base.SetDefaultContentHeaders(type, headers, mediaType);
}

[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
Expand Down