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

#59 fixes

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2021-01-07 19:53:01 +03:30
parent 7af46975e3
commit 43d4ab2436
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
RMuseum/Services/Implementation/GanjoorService.cs
View File

@ -337,16 +337,7 @@ namespace RMuseum.Services.Implementation
page.Poem = poemRes.Result;
}
break;
case GanjoorPageType.PoetPage:
{
var poetRes = await GetPoetById((int)dbPage.PoetId);
if(!string.IsNullOrEmpty(poetRes.ExceptionString))
{
return new RServiceResult<GanjoorPageCompleteViewModel>(null, poetRes.ExceptionString);
}
page.PoetOrCat = poetRes.Result;
}
break;
case GanjoorPageType.CatPage:
{
var catRes = await GetCatById((int)dbPage.CatId);
@ -357,6 +348,19 @@ namespace RMuseum.Services.Implementation
page.PoetOrCat = catRes.Result;
}
break;
default:
{
if (dbPage.PoetId != null)
{
var poetRes = await GetPoetById((int)dbPage.PoetId);
if (!string.IsNullOrEmpty(poetRes.ExceptionString))
{
return new RServiceResult<GanjoorPageCompleteViewModel>(null, poetRes.ExceptionString);
}
page.PoetOrCat = poetRes.Result;
}
}
break;
}
return new RServiceResult<GanjoorPageCompleteViewModel>(page);
@ -993,7 +997,7 @@ namespace RMuseum.Services.Implementation
:
GanjoorPageType.None;
int? poetId = row["post_author"].ToString() == "0" ? (int?)null : int.Parse(row["post_author"].ToString());
int? poetId = row["post_author"].ToString() == "1" ? (int?)null : int.Parse(row["post_author"].ToString());
if (poetId == 36)//رشحه
{
continue;
@ -1017,7 +1021,7 @@ namespace RMuseum.Services.Implementation
UrlSlug = row["post_name"].ToString(),
HtmlText = row["post_content"].ToString(),
ParentId = row["post_parent"].ToString() == "0" ? (int?)null : int.Parse(row["post_parent"].ToString()),
PoetId = row["post_author"].ToString() == "1" ? (int?)null : int.Parse(row["post_author"].ToString()),
PoetId = poetId,
SecondPoetId = row["other_poet_id"] == DBNull.Value ? (int?)null : int.Parse(row["other_poet_id"].ToString()),
PostDate = (DateTime)row["post_date"]
};