admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-05-08 23:49:17 +00:00
parent d3ce5ebe6f
commit a640676ac3
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/AyaNova/Controllers/AttachmentController.cs
View File

@@ -208,7 +208,10 @@ namespace AyaNova.Api.Controllers
string Notes = string.Empty; string Notes = string.Empty;
List<fileData> FileData = new List<fileData>(); List<fileData> FileData = new List<fileData>();
if (!uploadFormData.FormFieldData.ContainsKey("AttachToObjectType") || !uploadFormData.FormFieldData.ContainsKey("AttachToObjectId")) if (
!uploadFormData.FormFieldData.ContainsKey("FileData") ||
!uploadFormData.FormFieldData.ContainsKey("AttachToObjectType") ||
!uploadFormData.FormFieldData.ContainsKey("AttachToObjectId"))
{ {
badRequest = true; badRequest = true;
errorMessage = "AttachToObjectType and / or AttachToObjectId are missing and are required"; errorMessage = "AttachToObjectType and / or AttachToObjectId are missing and are required";
@@ -217,7 +220,7 @@ namespace AyaNova.Api.Controllers
{ {
AttachToObjectType = uploadFormData.FormFieldData["AttachToObjectType"].ToString(); AttachToObjectType = uploadFormData.FormFieldData["AttachToObjectType"].ToString();
AttachToObjectId = uploadFormData.FormFieldData["AttachToObjectId"].ToString(); AttachToObjectId = uploadFormData.FormFieldData["AttachToObjectId"].ToString();
if(uploadFormData.FormFieldData.ContainsKey("Notes")) if (uploadFormData.FormFieldData.ContainsKey("Notes"))
Notes = uploadFormData.FormFieldData["Notes"].ToString(); Notes = uploadFormData.FormFieldData["Notes"].ToString();
//fileData in JSON stringify format which contains the actual last modified dates etc //fileData in JSON stringify format which contains the actual last modified dates etc
//"[{\"name\":\"Client.csv\",\"lastModified\":1582822079618},{\"name\":\"wmi4fu06nrs41.jpg\",\"lastModified\":1586900220990}]" //"[{\"name\":\"Client.csv\",\"lastModified\":1582822079618},{\"name\":\"wmi4fu06nrs41.jpg\",\"lastModified\":1586900220990}]"
@@ -486,10 +489,10 @@ namespace AyaNova.Api.Controllers
async private Task<object> GetFileListForObjectAsync(AyaType ayaType, long ayaId) async private Task<object> GetFileListForObjectAsync(AyaType ayaType, long ayaId)
{ {
var l= await ct.FileAttachment.AsNoTracking().Where(m => m.AttachToObjectId == ayaId && m.AttachToObjectType == ayaType) var l = await ct.FileAttachment.AsNoTracking().Where(m => m.AttachToObjectId == ayaId && m.AttachToObjectType == ayaType)
.Select(m => new { m.Id, m.ConcurrencyToken, m.ContentType, m.DisplayFileName, m.LastModified, m.Notes }) .Select(m => new { m.Id, m.ConcurrencyToken, m.ContentType, m.DisplayFileName, m.LastModified, m.Notes })
.ToArrayAsync(); .ToArrayAsync();
var v= l.OrderBy(m=> m.DisplayFileName); var v = l.OrderBy(m => m.DisplayFileName);
return v; return v;
} }