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

Bug Fix #83: Correct case in attachment usernames

Browse Source
This commit is contained in:
Gary Sharp
2015-02-02 19:00:58 +11:00
parent a7b3f045d6
commit 23db0b6111
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.BI/BI/Extensions/AttachmentActionExtensions.cs
+3 -3
View File
@@ -20,7 +20,7 @@ namespace Disco.BI.Extensions
return true; return true;
if (UserService.CurrentAuthorization.Has(Claims.Device.Actions.RemoveOwnAttachments) if (UserService.CurrentAuthorization.Has(Claims.Device.Actions.RemoveOwnAttachments)
&& da.TechUserId == UserService.CurrentUserId) && da.TechUserId.Equals(UserService.CurrentUserId, StringComparison.OrdinalIgnoreCase))
return true; return true;
return false; return false;
@@ -45,7 +45,7 @@ namespace Disco.BI.Extensions
return true; return true;
if (UserService.CurrentAuthorization.Has(Claims.Job.Actions.RemoveOwnAttachments) if (UserService.CurrentAuthorization.Has(Claims.Job.Actions.RemoveOwnAttachments)
&& ja.TechUserId == UserService.CurrentUserId) && ja.TechUserId.Equals(UserService.CurrentUserId, StringComparison.OrdinalIgnoreCase))
return true; return true;
return false; return false;
@@ -70,7 +70,7 @@ namespace Disco.BI.Extensions
return true; return true;
if (UserService.CurrentAuthorization.Has(Claims.User.Actions.RemoveOwnAttachments) if (UserService.CurrentAuthorization.Has(Claims.User.Actions.RemoveOwnAttachments)
&& ua.TechUserId == UserService.CurrentUserId) && ua.TechUserId.Equals(UserService.CurrentUserId, StringComparison.OrdinalIgnoreCase))
return true; return true;
return false; return false;
Disco.Web/Areas/API/Controllers/DeviceController.cs
+1 -1
View File
@@ -490,7 +490,7 @@ namespace Disco.Web.Areas.API.Controllers
var da = new DeviceAttachment() var da = new DeviceAttachment()
{ {
DeviceSerialNumber = d.SerialNumber, DeviceSerialNumber = d.SerialNumber,
TechUserId = UserService.CurrentUserId, TechUserId = UserService.CurrentUser.UserId,
Filename = file.FileName, Filename = file.FileName,
MimeType = contentType, MimeType = contentType,
Timestamp = DateTime.Now, Timestamp = DateTime.Now,
Disco.Web/Areas/API/Controllers/DocumentTemplateController.cs
+1 -1
View File
@@ -558,7 +558,7 @@ namespace Disco.Web.Areas.API.Controllers
{ {
var undetectedLocation = DataStore.CreateLocation(Database, "DocumentDropBox_Unassigned"); var undetectedLocation = DataStore.CreateLocation(Database, "DocumentDropBox_Unassigned");
var filename = System.IO.Path.Combine(undetectedLocation, string.Concat(id, ".pdf")); 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 // Delete File
System.IO.File.Delete(filename); System.IO.File.Delete(filename);
Disco.Web/Areas/API/Controllers/UserController.cs
+1 -1
View File
@@ -75,7 +75,7 @@ namespace Disco.Web.Areas.API.Controllers
var ua = new Disco.Models.Repository.UserAttachment() var ua = new Disco.Models.Repository.UserAttachment()
{ {
UserId = u.UserId, UserId = u.UserId,
TechUserId = UserService.CurrentUserId, TechUserId = UserService.CurrentUser.UserId,
Filename = file.FileName, Filename = file.FileName,
MimeType = contentType, MimeType = contentType,
Timestamp = DateTime.Now, Timestamp = DateTime.Now,