From 3d0245dd9ff6928a2729777091970a16944c3e0c Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 3 Sep 2020 12:15:04 +0300 Subject: [PATCH] docs module: show doc parameters when displaying default language document --- .../Pages/Documents/Project/Index.cshtml | 2 +- .../Pages/Documents/Project/Index.cshtml.cs | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml index bd76814461..afbb5fcf5b 100644 --- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml +++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml @@ -295,7 +295,7 @@
- @if (Model.DocumentLanguageIsDifferent) + @if (Model.DocumentLanguageCode != Model.LanguageCode) { @L["DocumentNotFoundInSelectedLanguage"] diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs index 03a05f2e78..777875660a 100644 --- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs +++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs @@ -64,7 +64,7 @@ namespace Volo.Docs.Pages.Documents.Project public bool ShowProjectsCombobox { get; set; } - public bool DocumentLanguageIsDifferent { get; set; } + public string DocumentLanguageCode { get; set; } public DocumentParametersDto DocumentPreferences { get; set; } @@ -403,6 +403,7 @@ namespace Volo.Docs.Pages.Documents.Project try { Document = await GetSpecificDocumentOrDefaultAsync(LanguageCode); + DocumentLanguageCode = LanguageCode; } catch (DocumentNotFoundException) { @@ -410,7 +411,7 @@ namespace Volo.Docs.Pages.Documents.Project { Document = await GetSpecificDocumentOrDefaultAsync(DefaultLanguageCode); - DocumentLanguageIsDifferent = true; + DocumentLanguageCode = DefaultLanguageCode; } else { @@ -500,7 +501,7 @@ namespace Volo.Docs.Pages.Documents.Project { var content = (await _documentAppService.GetAsync(new GetDocumentInput { - LanguageCode = LanguageCode, + LanguageCode = DocumentLanguageCode, Name = partialTemplate.Path, ProjectId = Project.Id, Version = Version @@ -518,7 +519,7 @@ namespace Volo.Docs.Pages.Documents.Project private void SetUserPreferences() { - UserPreferences.Add("Document_Language_Code", LanguageCode); + UserPreferences.Add("Document_Language_Code", DocumentLanguageCode); UserPreferences.Add("Document_Version", Version); var cookie = Request.Cookies["AbpDocsPreferences"]; @@ -608,7 +609,7 @@ namespace Volo.Docs.Pages.Documents.Project new GetParametersDocumentInput { ProjectId = Project.Id, - LanguageCode = LanguageCode, + LanguageCode = DocumentLanguageCode, Version = Version });