Browse Source

docs: fix LatestVersionBranchName comparassion bug

pull/4782/head
Yunus Emre Kalkan 6 years ago
parent
commit
70bc7e3318
  1. 7
      modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs
  2. 10
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
  3. 4
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs

7
modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs

@ -86,11 +86,6 @@ namespace Volo.Docs.Projects
}
}
if (versions.Any() && !string.IsNullOrEmpty(project.LatestVersionBranchName))
{
versions.First().Name = project.LatestVersionBranchName;
}
return versions;
}
@ -126,4 +121,4 @@ namespace Volo.Docs.Projects
);
}
}
}
}

10
modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs

@ -257,6 +257,8 @@ namespace Volo.Docs.Pages.Documents.Project
.Select(v => new VersionInfoViewModel(v.DisplayName, v.Name))
.ToList();
SetLatestVersionBranchName(versions);
if (versions.Any())
{
LatestStableVersionInfo = versions.FirstOrDefault(v => !VersionHelper.IsPreRelease(v.Version)) ?? versions.First();
@ -299,6 +301,14 @@ namespace Volo.Docs.Pages.Documents.Project
}).ToList();
}
private void SetLatestVersionBranchName(List<VersionInfoViewModel> versions)
{
if (versions.Any() && !string.IsNullOrEmpty(Project.LatestVersionBranchName))
{
versions.First(v=> !SemanticVersion.Parse(v.Version).IsPrerelease).Version = Project.LatestVersionBranchName;
}
}
private async Task SetNavigationAsync()
{
try

4
modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs

@ -62,7 +62,9 @@ namespace Volo.Docs.Pages.Documents
if (versions.Any() && string.Equals(Version, DocsAppConsts.Latest, StringComparison.OrdinalIgnoreCase))
{
Version = (versions.FirstOrDefault(v=> !VersionHelper.IsPreRelease(v.Name)) ?? versions.First()).Name;
Version = string.IsNullOrEmpty(Project.LatestVersionBranchName) ?
(versions.FirstOrDefault(v=> !VersionHelper.IsPreRelease(v.Name)) ?? versions.First()).Name :
Project.LatestVersionBranchName;
}
SearchOutputs = await _documentAppService.SearchAsync(new DocumentSearchInput

Loading…
Cancel
Save