diff --git a/GanjooRazor/Areas/Admin/Pages/CatUtils.cshtml b/GanjooRazor/Areas/Admin/Pages/CatUtils.cshtml index e72c2924..717c8364 100644 --- a/GanjooRazor/Areas/Admin/Pages/CatUtils.cshtml +++ b/GanjooRazor/Areas/Admin/Pages/CatUtils.cshtml @@ -338,6 +338,15 @@ + + @if(Model.PoemRelatedImages.Any(r => r.PoemId == poem.Id)) + { + + + + + + } } diff --git a/GanjooRazor/Areas/Admin/Pages/CatUtils.cshtml.cs b/GanjooRazor/Areas/Admin/Pages/CatUtils.cshtml.cs index 89e4b9ca..3143b031 100644 --- a/GanjooRazor/Areas/Admin/Pages/CatUtils.cshtml.cs +++ b/GanjooRazor/Areas/Admin/Pages/CatUtils.cshtml.cs @@ -78,6 +78,8 @@ namespace GanjooRazor.Areas.Admin.Pages [BindProperty] public GanjoorCatViewModel CatMeta { get; set; } + public PoemRelatedImageEx[] PoemRelatedImages { get; set; } + private async Task ReadLanguagesAsync() { HttpResponseMessage response = await _httpClient.GetAsync($"{APIRoot.Url}/api/translations/languages"); @@ -139,6 +141,14 @@ namespace GanjooRazor.Areas.Admin.Pages } Numberings = JsonConvert.DeserializeObject(await numberings.Content.ReadAsStringAsync()); + var images = await _httpClient.GetAsync($"{APIRoot.Url}/api/ganjoor/cat/{Cat.Cat.Id}/images"); + if (!images.IsSuccessStatusCode) + { + LastMessage = JsonConvert.DeserializeObject(await images.Content.ReadAsStringAsync()); + return false; + } + PoemRelatedImages = JsonConvert.DeserializeObject(await images.Content.ReadAsStringAsync()); + await ReadLanguagesAsync(); return true; } diff --git a/RMuseum/Services/Implementation/GanjoorService.cs b/RMuseum/Services/Implementation/GanjoorService.cs index 362e6d2b..6803a003 100644 --- a/RMuseum/Services/Implementation/GanjoorService.cs +++ b/RMuseum/Services/Implementation/GanjoorService.cs @@ -3879,7 +3879,7 @@ namespace RMuseum.Services.Implementation where link.ReviewResult == ReviewResult.Approved && - poem.Id == catId + poem.CatId == catId orderby poem.Id select new PoemRelatedImageEx() {