From 74650ad83d0bbfdcfdb586d20dd475c5e2c28c2a Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 25 Jun 2020 18:02:25 +0000 Subject: [PATCH] --- server/AyaNova/Controllers/TranslationController.cs | 5 +++-- server/AyaNova/biz/TranslationBiz.cs | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/AyaNova/Controllers/TranslationController.cs b/server/AyaNova/Controllers/TranslationController.cs index 8e1081ae..05daaad0 100644 --- a/server/AyaNova/Controllers/TranslationController.cs +++ b/server/AyaNova/Controllers/TranslationController.cs @@ -14,6 +14,7 @@ using AyaNova.Biz; using System; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; +using Newtonsoft.Json.Linq; using System.Linq; using AyaNova.Util; @@ -402,10 +403,10 @@ namespace AyaNova.Api.Controllers //deserialize each file and import foreach (UploadedFileInfo a in uploadFormData.UploadedFiles) { - if (!await biz.ImportAsync(ImportJson)) + JObject o = JObject.Parse(System.IO.File.ReadAllText(a.InitialUploadedPathName)); + if (!await biz.ImportAsync(o)) { //delete all the files temporarily uploaded and return bad request - DeleteTempUploadFile(uploadFormData); return BadRequest(new ApiErrorResponse(biz.Errors)); } diff --git a/server/AyaNova/biz/TranslationBiz.cs b/server/AyaNova/biz/TranslationBiz.cs index 08bf2b9c..acccab78 100644 --- a/server/AyaNova/biz/TranslationBiz.cs +++ b/server/AyaNova/biz/TranslationBiz.cs @@ -129,6 +129,8 @@ namespace AyaNova.Biz // internal async Task ImportAsync(JObject o) { + + var v = o.Count; // Translation dbObject = await ct.Translation.Include(z => z.TranslationItems).SingleOrDefaultAsync(z => z.Id == id); // if (dbObject == null)