From 23db0b6111d192f18b303248f92138ba28784564 Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Mon, 2 Feb 2015 19:00:58 +1100 Subject: [PATCH] Bug Fix #83: Correct case in attachment usernames --- Disco.BI/BI/Extensions/AttachmentActionExtensions.cs | 6 +++--- Disco.Web/Areas/API/Controllers/DeviceController.cs | 2 +- .../Areas/API/Controllers/DocumentTemplateController.cs | 2 +- Disco.Web/Areas/API/Controllers/UserController.cs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Disco.BI/BI/Extensions/AttachmentActionExtensions.cs b/Disco.BI/BI/Extensions/AttachmentActionExtensions.cs index b582301a..6219d761 100644 --- a/Disco.BI/BI/Extensions/AttachmentActionExtensions.cs +++ b/Disco.BI/BI/Extensions/AttachmentActionExtensions.cs @@ -20,7 +20,7 @@ namespace Disco.BI.Extensions return true; if (UserService.CurrentAuthorization.Has(Claims.Device.Actions.RemoveOwnAttachments) - && da.TechUserId == UserService.CurrentUserId) + && da.TechUserId.Equals(UserService.CurrentUserId, StringComparison.OrdinalIgnoreCase)) return true; return false; @@ -45,7 +45,7 @@ namespace Disco.BI.Extensions return true; if (UserService.CurrentAuthorization.Has(Claims.Job.Actions.RemoveOwnAttachments) - && ja.TechUserId == UserService.CurrentUserId) + && ja.TechUserId.Equals(UserService.CurrentUserId, StringComparison.OrdinalIgnoreCase)) return true; return false; @@ -70,7 +70,7 @@ namespace Disco.BI.Extensions return true; if (UserService.CurrentAuthorization.Has(Claims.User.Actions.RemoveOwnAttachments) - && ua.TechUserId == UserService.CurrentUserId) + && ua.TechUserId.Equals(UserService.CurrentUserId, StringComparison.OrdinalIgnoreCase)) return true; return false; diff --git a/Disco.Web/Areas/API/Controllers/DeviceController.cs b/Disco.Web/Areas/API/Controllers/DeviceController.cs index cf3c2373..47e2da77 100644 --- a/Disco.Web/Areas/API/Controllers/DeviceController.cs +++ b/Disco.Web/Areas/API/Controllers/DeviceController.cs @@ -490,7 +490,7 @@ namespace Disco.Web.Areas.API.Controllers var da = new DeviceAttachment() { DeviceSerialNumber = d.SerialNumber, - TechUserId = UserService.CurrentUserId, + TechUserId = UserService.CurrentUser.UserId, Filename = file.FileName, MimeType = contentType, Timestamp = DateTime.Now, diff --git a/Disco.Web/Areas/API/Controllers/DocumentTemplateController.cs b/Disco.Web/Areas/API/Controllers/DocumentTemplateController.cs index f777559f..7b24258b 100644 --- a/Disco.Web/Areas/API/Controllers/DocumentTemplateController.cs +++ b/Disco.Web/Areas/API/Controllers/DocumentTemplateController.cs @@ -558,7 +558,7 @@ namespace Disco.Web.Areas.API.Controllers { var undetectedLocation = DataStore.CreateLocation(Database, "DocumentDropBox_Unassigned"); var filename = System.IO.Path.Combine(undetectedLocation, string.Concat(id, ".pdf")); - if (BI.Interop.Pdf.PdfImporter.ProcessPdfAttachment(filename, Database, DocumentTemplateId, DataId, UserService.CurrentUserId, DateTime.Now)) + if (BI.Interop.Pdf.PdfImporter.ProcessPdfAttachment(filename, Database, DocumentTemplateId, DataId, UserService.CurrentUser.UserId, DateTime.Now)) { // Delete File System.IO.File.Delete(filename); diff --git a/Disco.Web/Areas/API/Controllers/UserController.cs b/Disco.Web/Areas/API/Controllers/UserController.cs index c06d0115..4e12d710 100644 --- a/Disco.Web/Areas/API/Controllers/UserController.cs +++ b/Disco.Web/Areas/API/Controllers/UserController.cs @@ -75,7 +75,7 @@ namespace Disco.Web.Areas.API.Controllers var ua = new Disco.Models.Repository.UserAttachment() { UserId = u.UserId, - TechUserId = UserService.CurrentUserId, + TechUserId = UserService.CurrentUser.UserId, Filename = file.FileName, MimeType = contentType, Timestamp = DateTime.Now,