diff --git a/GanjooRazor/Areas/Admin/Pages/Poet.cshtml b/GanjooRazor/Areas/Admin/Pages/Poet.cshtml index c5a69f64..4b565998 100644 --- a/GanjooRazor/Areas/Admin/Pages/Poet.cshtml +++ b/GanjooRazor/Areas/Admin/Pages/Poet.cshtml @@ -11,7 +11,7 @@ @if(!string.IsNullOrEmpty(Model.LastResult)) {

- @Model.LastResult + @Html.Raw(Model.LastResult)

} @@ -75,16 +75,11 @@ - - - برگشت به شاعر - - - + - - -
تصحیح از طریق دیتابیس:تصحیح از طریق پایگاه داده‌ها:
@@ -93,11 +88,6 @@
- برگشت به شاعر -
diff --git a/GanjooRazor/Areas/Admin/Pages/Poet.cshtml.cs b/GanjooRazor/Areas/Admin/Pages/Poet.cshtml.cs index 526a73e7..a7aed45d 100644 --- a/GanjooRazor/Areas/Admin/Pages/Poet.cshtml.cs +++ b/GanjooRazor/Areas/Admin/Pages/Poet.cshtml.cs @@ -138,7 +138,7 @@ namespace GanjooRazor.Areas.Admin.Pages _memoryCache.Remove(cacheKey2); } - LastResult = "ویرایش انجام شد."; + LastResult = $"ویرایش انجام شد. برگشت به صفحهٔ ویرایش شاعر"; await PreparePoet(); @@ -169,7 +169,7 @@ namespace GanjooRazor.Areas.Admin.Pages HttpResponseMessage response = await secureClient.PostAsync($"{APIRoot.Url}/api/ganjoor/poet/image/{Request.Query["id"]}", form); response.EnsureSuccessStatusCode(); - LastResult = "تصویر بارگذاری شد."; + LastResult = $"تصویر بارگذاری شد. برگشت به صفحهٔ ویرایش شاعر"; } } @@ -195,10 +195,10 @@ namespace GanjooRazor.Areas.Admin.Pages var fileContent = stream.ToArray(); form.Add(new ByteArrayContent(fileContent, 0, fileContent.Length), Poet.Nickname, SQLiteDb.FileName); - HttpResponseMessage response = await secureClient.PostAsync($"{APIRoot.Url}/api/ganjoor/sqliteimport/{Request.Query["id"]}", form); + HttpResponseMessage response = await secureClient.PostAsync($"{APIRoot.Url}/api/ganjoor/sqlite/import/{Request.Query["id"]}", form); response.EnsureSuccessStatusCode(); - LastResult = "پایگاه داده‌ها بارگذاری شد."; + LastResult = $"پایگاه داده‌ها بارگذاری شد. برگشت به صفحهٔ ویرایش شاعر"; } } @@ -224,10 +224,10 @@ namespace GanjooRazor.Areas.Admin.Pages var fileContent = stream.ToArray(); form.Add(new ByteArrayContent(fileContent, 0, fileContent.Length), Poet.Nickname, CorrecionDbModel.Db.FileName); - HttpResponseMessage response = await secureClient.PostAsync($"{APIRoot.Url}/api/ganjoor/sqliteupdate/{Request.Query["id"]}?note={CorrecionDbModel.Note}", form); + HttpResponseMessage response = await secureClient.PostAsync($"{APIRoot.Url}/api/ganjoor/sqlite/update/{Request.Query["id"]}?note={CorrecionDbModel.Note}", form); response.EnsureSuccessStatusCode(); - LastResult = "پایگاه داده‌ها بارگذاری شد."; + LastResult = $"پایگاه داده‌های اصلاحی بارگذاری شد. برگشت به صفحهٔ ویرایش شاعر"; } } diff --git a/RMuseum/Controllers/GanjoorController.cs b/RMuseum/Controllers/GanjoorController.cs index e72da705..7202e4f1 100644 --- a/RMuseum/Controllers/GanjoorController.cs +++ b/RMuseum/Controllers/GanjoorController.cs @@ -1160,7 +1160,7 @@ namespace RMuseum.Controllers /// [HttpPost] - [Route("sqliteimport/{poetId}")] + [Route("sqlite/import/{poetId}")] [Authorize(Policy = RMuseumSecurableItem.GanjoorEntityShortName + ":" + RMuseumSecurableItem.ImportOperationShortName)] [ProducesResponseType((int)HttpStatusCode.OK, Type = typeof(bool))] [ProducesResponseType((int)HttpStatusCode.BadRequest, Type = typeof(string))] @@ -1182,7 +1182,7 @@ namespace RMuseum.Controllers /// /// [HttpPost] - [Route("sqliteupdate/{poetId}")] + [Route("sqlite/update/{poetId}")] [Authorize(Policy = RMuseumSecurableItem.GanjoorEntityShortName + ":" + RMuseumSecurableItem.ImportOperationShortName)] [ProducesResponseType((int)HttpStatusCode.OK, Type = typeof(bool))] [ProducesResponseType((int)HttpStatusCode.BadRequest, Type = typeof(string))] @@ -1203,7 +1203,7 @@ namespace RMuseum.Controllers /// /// [HttpGet] - [Route("sqliteexport/{poetId}")] + [Route("sqlite/export/{poetId}")] [Authorize(Policy = RMuseumSecurableItem.GanjoorEntityShortName + ":" + RMuseumSecurableItem.ImportOperationShortName)] [ProducesResponseType((int)HttpStatusCode.OK, Type = typeof(FileStreamResult))] [ProducesResponseType((int)HttpStatusCode.BadRequest, Type = typeof(string))] @@ -1222,7 +1222,7 @@ namespace RMuseum.Controllers /// /// [HttpPost] - [Route("mysqlimport")] + [Route("mysql/import")] [Authorize(Policy = RMuseumSecurableItem.GanjoorEntityShortName + ":" + RMuseumSecurableItem.ImportOperationShortName)] [ProducesResponseType((int)HttpStatusCode.OK, Type = typeof(bool))] [ProducesResponseType((int)HttpStatusCode.BadRequest, Type = typeof(string))] diff --git a/RMuseum/Services/Implementation/GanjoorService-Imports/GanjoorService-SQLiteImport.cs b/RMuseum/Services/Implementation/GanjoorService-Imports/GanjoorService-SQLiteImport.cs index fc07b0be..4225b88e 100644 --- a/RMuseum/Services/Implementation/GanjoorService-Imports/GanjoorService-SQLiteImport.cs +++ b/RMuseum/Services/Implementation/GanjoorService-Imports/GanjoorService-SQLiteImport.cs @@ -132,7 +132,7 @@ namespace RMuseum.Services.Implementation using (RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions())) //this is long running job, so _context might be already been freed/collected by GC { LongRunningJobProgressServiceEF jobProgressServiceEF = new LongRunningJobProgressServiceEF(context); - var job = (await jobProgressServiceEF.NewJob("ImportFromSqlite", "Query data")).Result; + var job = (await jobProgressServiceEF.NewJob("ApplyCorrectionsFromSqlite", "Query data")).Result; try {