jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor: return correct content type for jpg

Browse Source
This commit is contained in:
Gary Sharp
2022-12-04 13:41:38 +11:00
parent 4f9f0fd0a8
commit 4c19a1ef63
4 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Areas/API/Controllers/DeviceBatchController.cs
+1 -1
View File
@@ -644,7 +644,7 @@ namespace Disco.Web.Areas.API.Controllers
if (thumbPath.EndsWith(".png", StringComparison.OrdinalIgnoreCase)) if (thumbPath.EndsWith(".png", StringComparison.OrdinalIgnoreCase))
return File(thumbPath, "image/png"); return File(thumbPath, "image/png");
else else
return File(thumbPath, "image/jpg"); return File(thumbPath, "image/jpeg");
} }
else else
return File(ClientSource.Style.Images.AttachmentTypes.MimeTypeIcons.Icon(attachment.MimeType), "image/png"); return File(ClientSource.Style.Images.AttachmentTypes.MimeTypeIcons.Icon(attachment.MimeType), "image/png");
Disco.Web/Areas/API/Controllers/DeviceController.cs
+1 -1
View File
@@ -460,7 +460,7 @@ namespace Disco.Web.Areas.API.Controllers
if (thumbPath.EndsWith(".png", StringComparison.OrdinalIgnoreCase)) if (thumbPath.EndsWith(".png", StringComparison.OrdinalIgnoreCase))
return File(thumbPath, "image/png"); return File(thumbPath, "image/png");
else else
return File(thumbPath, "image/jpg"); return File(thumbPath, "image/jpeg");
} }
else else
return File(ClientSource.Style.Images.AttachmentTypes.MimeTypeIcons.Icon(da.MimeType), "image/png"); return File(ClientSource.Style.Images.AttachmentTypes.MimeTypeIcons.Icon(da.MimeType), "image/png");
Disco.Web/Areas/API/Controllers/JobController.cs
+1 -1
View File
@@ -1904,7 +1904,7 @@ namespace Disco.Web.Areas.API.Controllers
if (thumbPath.EndsWith(".png", StringComparison.OrdinalIgnoreCase)) if (thumbPath.EndsWith(".png", StringComparison.OrdinalIgnoreCase))
return File(thumbPath, "image/png"); return File(thumbPath, "image/png");
else else
return File(thumbPath, "image/jpg"); return File(thumbPath, "image/jpeg");
} }
else else
return File(ClientSource.Style.Images.AttachmentTypes.MimeTypeIcons.Icon(ja.MimeType), "image/png"); return File(ClientSource.Style.Images.AttachmentTypes.MimeTypeIcons.Icon(ja.MimeType), "image/png");
Disco.Web/Areas/API/Controllers/UserController.cs
+4 -10
View File
@@ -1,25 +1,19 @@
using Disco.BI.Extensions; using Disco.Services;
using Disco.Models.Repository;
using Disco.Models.Services.Documents;
using Disco.Services;
using Disco.Services.Authorization; using Disco.Services.Authorization;
using Disco.Services.Documents;
using Disco.Services.Interop; using Disco.Services.Interop;
using Disco.Services.Interop.ActiveDirectory; using Disco.Services.Interop.ActiveDirectory;
using Disco.Services.Plugins.Features.DetailsProvider; using Disco.Services.Plugins.Features.DetailsProvider;
using Disco.Services.Users; using Disco.Services.Users;
using Disco.Services.Web; using Disco.Services.Web;
using System; using System;
using System.IO;
using System.Linq; using System.Linq;
using System.Web;
using System.Web.Mvc; using System.Web.Mvc;
namespace Disco.Web.Areas.API.Controllers namespace Disco.Web.Areas.API.Controllers
{ {
public partial class UserController : AuthorizedDatabaseController public partial class UserController : AuthorizedDatabaseController
{ {
#region User Attachements #region User Attachments
[DiscoAuthorize(Claims.User.ShowAttachments)] [DiscoAuthorize(Claims.User.ShowAttachments)]
[OutputCache(Location = System.Web.UI.OutputCacheLocation.Client, Duration = 172800)] [OutputCache(Location = System.Web.UI.OutputCacheLocation.Client, Duration = 172800)]
@@ -54,7 +48,7 @@ namespace Disco.Web.Areas.API.Controllers
if (thumbPath.EndsWith(".png", StringComparison.OrdinalIgnoreCase)) if (thumbPath.EndsWith(".png", StringComparison.OrdinalIgnoreCase))
return File(thumbPath, "image/png"); return File(thumbPath, "image/png");
else else
return File(thumbPath, "image/jpg"); return File(thumbPath, "image/jpeg");
} }
else else
return File(ClientSource.Style.Images.AttachmentTypes.MimeTypeIcons.Icon(ua.MimeType), "image/png"); return File(ClientSource.Style.Images.AttachmentTypes.MimeTypeIcons.Icon(ua.MimeType), "image/png");
@@ -209,7 +203,7 @@ namespace Disco.Web.Areas.API.Controllers
if (photo == null) if (photo == null)
return HttpNotFound(); return HttpNotFound();
return File(photo, "image/jpg"); return File(photo, "image/jpeg");
} }
} }