anas/divan
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

docs: #285 bug fixes

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2022-03-03 20:38:03 +03:30
parent 5a175d25b7
commit b3e9f3077d
7 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
GanjooRazor/Areas/User/Pages/FAQItems.cshtml
View File

@ -84,7 +84,7 @@ else
<select name="cat" id="cat" onchange="onSelectedCatChanged()">
@foreach (var category in Model.Categories)
{
@if(category.Id == Model.CatId)
@if (category.Id == Model.CatId)
{
<option value="@category.Id" selected>@category.Title</option>
}
@ -110,9 +110,12 @@ else
<a role="button" onclick="newItem()" class="pagebutton">پرسش جدید</a>
</p>
<div id="catItems">
@foreach(var item in Model.CategoryItems)
@if (Model.CategoryItems != null)
{
<p><a href="/User/FAQItemEdit?id=@item.Id">@item.Question</a></p>
@foreach (var item in Model.CategoryItems)
{
<p><a href="/User/FAQItemEdit?id=@item.Id">@item.Question</a></p>
}
}
</div>

19
GanjooRazor/Areas/User/Pages/FAQItems.cshtml.cs
View File

@ -52,19 +52,13 @@ namespace GanjooRazor.Areas.User.Pages
if(Categories.Length > 0)
{
CatId = string.IsNullOrEmpty(Request.Query["catId"]) ? Categories[0].Id : int.Parse(Request.Query["catId"]);
response = await secureClient.GetAsync($"{APIRoot.Url}/api/faq/cat/items?catId={CatId}");
response = await secureClient.GetAsync($"{APIRoot.Url}/api/faq/cat/items/secure?catId={CatId}");
if (!response.IsSuccessStatusCode)
{
return new BadRequestObjectResult(JsonConvert.DeserializeObject<string>(await response.Content.ReadAsStringAsync()));
}
var items = JsonConvert.DeserializeObject<FAQItem[]>(await response.Content.ReadAsStringAsync());
if (items == null)
{
items = new FAQItem[] { };
}
CategoryItems = items;
CategoryItems = JsonConvert.DeserializeObject<FAQItem[]>(await response.Content.ReadAsStringAsync());
}
}
@ -104,18 +98,13 @@ namespace GanjooRazor.Areas.User.Pages
{
if (await GanjoorSessionChecker.PrepareClient(secureClient, Request, Response))
{
HttpResponseMessage response = await secureClient.GetAsync($"{APIRoot.Url}/api/faq/cat/items?catId={id}");
HttpResponseMessage response = await secureClient.GetAsync($"{APIRoot.Url}/api/faq/cat/items/secure?catId={id}");
if (!response.IsSuccessStatusCode)
{
return new BadRequestObjectResult(JsonConvert.DeserializeObject<string>(await response.Content.ReadAsStringAsync()));
}
var items = JsonConvert.DeserializeObject<FAQItem[]>(await response.Content.ReadAsStringAsync());
if(items == null)
{
items = new FAQItem[] { };
}
return new JsonResult(items);
return new JsonResult(JsonConvert.DeserializeObject<FAQItem[]>(await response.Content.ReadAsStringAsync()));
}
else

4
GanjooRazor/appsettings.json
View File

@ -8,8 +8,8 @@
},
"AllowedHosts": "*",
"GoogleAnalyticsCode": "",
"APIRoot": "https://api.ganjoor.net",
"GlobalAPIRoot": "https://api.ganjoor.net",
"APIRoot": "http://localhost:3439",
"GlobalAPIRoot": "http://localhost:3439",
"SiteUrl": "http://localhost:33081",
"MockSpotify": "False",
"AggressiveCacheEnabled": "False",

11
RMuseum/Models/FAQ/FAQCategory.cs
View File

@ -1,4 +1,7 @@
namespace RMuseum.Models.FAQ
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
namespace RMuseum.Models.FAQ
{
/// <summary>
/// FAQ Category
@ -29,5 +32,11 @@
/// published
/// </summary>
public bool Published { get; set; }
/// <summary>
/// category items
/// </summary>
[NotMapped]
public List<FAQItem> Items { get; set; }
}
}

5
RMuseum/RMuseum.xml
View File

@ -3932,6 +3932,11 @@
published
</summary>
</member>
<member name="P:RMuseum.Models.FAQ.FAQCategory.Items">
<summary>
category items
</summary>
</member>
<member name="T:RMuseum.Models.FAQ.FAQItem">
<summary>
FAQ Item

6
RMuseum/Services/Implementation/FAQService.cs
View File

@ -114,9 +114,10 @@ namespace RMuseum.Services.Implementation
/// <returns></returns>
public async Task<RServiceResult<FAQItem[]>> GetPinnedItemsAsync(bool onlyPublished)
{
var items = await _context.FAQItems.Where(c => c.Pinned && (c.Published == onlyPublished || c.Published == true)).OrderBy(c => c.PinnedItemOrder).ToArrayAsync();
return new RServiceResult<FAQItem[]>
(
await _context.FAQItems.Where(c => c.Pinned && (c.Published == onlyPublished || c.Published == true)).OrderBy(c => c.PinnedItemOrder).ToArrayAsync()
items
);
}
@ -128,9 +129,10 @@ namespace RMuseum.Services.Implementation
/// <returns></returns>
public async Task<RServiceResult<FAQItem[]>> GetCategoryItemsAsync(int categoryId, bool onlyPublished)
{
var items = await _context.FAQItems.Where(c => c.CategoryId == categoryId && (c.Published == onlyPublished || c.Published == true)).OrderBy(c => c.ItemOrderInCategory).ToArrayAsync();
return new RServiceResult<FAQItem[]>
(
await _context.FAQItems.Where(c => c.CategoryId == categoryId && (c.Published == onlyPublished || c.Published == true)).OrderBy(c => c.ItemOrderInCategory).ToArrayAsync()
items
);
}

2
RMuseum/appsettings.json
View File

@ -6,7 +6,7 @@
"ApplicationName": "Ganjoor",
"FirstUserEmail": "admin@ganjoor.net"
},
"DatabaseMigrate": "False",
"DatabaseMigrate": "True",
"AggressiveCacheEnabled": "False",
"PictureFileService": {
"StoragePath": "C:\\museum",