From ba4136a39a19ec2f2e07b90e0dc7cef8a3a9c39a Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 31 May 2019 09:22:51 +0300 Subject: [PATCH] Take first language if no default one is defined --- .../Volo/Docs/Documents/DocumentAppService.cs | 4 +++- .../Volo/Docs/Projects/ProjectAppService.cs | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs index 03fe9778f9..20ecf4d03f 100644 --- a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs +++ b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs @@ -139,7 +139,9 @@ namespace Volo.Docs.Documents { var language = languageCodes.Languages.FirstOrDefault(l => l.Code == languageCode); - return language ?? languageCodes.Languages.Single(l => l.IsDefault); + return language ?? + languageCodes.Languages.FirstOrDefault(l => l.IsDefault) ?? + languageCodes.Languages.First(); } protected virtual async Task GetLanguageListAsync(IDocumentStore store, Project project, string version) diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs index 19c4e66b7b..89de8ea363 100644 --- a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs +++ b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.Extensions.Caching.Distributed; +using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Caching; @@ -49,7 +50,7 @@ namespace Volo.Docs.Projects var store = _documentStoreFactory.Create(project.DocumentStoreType); var languageList = await store.GetLanguageListAsync(project, project.LatestVersionBranchName); - return languageList.Languages.Single(l=>l.IsDefault).Code; + return (languageList.Languages.FirstOrDefault(l => l.IsDefault) ?? languageList.Languages.First()).Code; } public async Task> GetVersionsAsync(string shortName)