From 0c5d2a17e55475c35b9e16ad5999a8be0682feeb Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 27 Jul 2020 12:44:07 +0300 Subject: [PATCH] Docs branch option: Use LatestVersionBranchName for latest version --- .../Pages/Documents/Project/Index.cshtml.cs | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) 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 a99c6e0bb6..dd8ba6bc9c 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 @@ -260,7 +260,7 @@ namespace Volo.Docs.Pages.Documents.Project if (versions.Any()) { - LatestVersionInfo = versions.FirstOrDefault(v => !_versionHelper.IsPreRelease(v.Version)) ?? versions.First(); + LatestVersionInfo = GetLatestVersionInfo(versions); SetLatestVersionBranchName(versions); @@ -304,6 +304,22 @@ namespace Volo.Docs.Pages.Documents.Project }).ToList(); } + private VersionInfoViewModel GetLatestVersionInfo(List versions) + { + if (Project.ExtraProperties.ContainsKey("GithubVersionProviderSource") + && (GithubVersionProviderSource) (long) Project.ExtraProperties["GithubVersionProviderSource"] == GithubVersionProviderSource.Branches) + { + var latest = versions.FirstOrDefault(v=> v.Version == Project.LatestVersionBranchName); + + if (latest != null) + { + return latest; + } + } + + return versions.FirstOrDefault(v => !_versionHelper.IsPreRelease(v.Version)) ?? versions.First(); + } + private void SetLatestVersionBranchName(List versions) { if (!Project.ExtraProperties.ContainsKey("GithubVersionProviderSource")