fixes the sorting of retreving wiki files

This commit is contained in:
Shannon
2017-05-15 19:22:16 +10:00
parent 1beedba67d
commit 8a24fc60ca
2 changed files with 7 additions and 2 deletions
@@ -373,6 +373,8 @@ namespace OurUmbraco.Repository.Services
.Where(x => x.PackageVersion != null && x.MinUmbracoVersion != null)
.OrderByDescending(x => x.PackageVersion)
.ThenByDescending(x => x.MinUmbracoVersion)
//need to sort by latest file Id too since multiple files can target the same umbraco versions but we want to take the latest uploaded file
.ThenByDescending(x => x.FileId)
.ToArray();
return allVersions;
}
@@ -392,6 +394,8 @@ namespace OurUmbraco.Repository.Services
.Select(x => new PackageVersionSupport(x.Id, x.Version.Version.GetFromUmbracoString(reduceToConfigured:false), null))
.Where(x => x.PackageVersion != null)
.OrderByDescending(x => x.PackageVersion)
//need to sort by latest file Id too since multiple files can target the same umbraco versions but we want to take the latest uploaded file
.ThenByDescending(x => x.FileId)
.ToArray();
return allVersions;
}
+3 -2
View File
@@ -415,11 +415,12 @@ namespace OurUmbraco.Wiki.BusinessLogic
public static List<UmbracoVersion> GetVersionsFromString(string p)
{
var umbracoVersions = new List<UmbracoVersion>();
var availableVersions = UmbracoVersion.AvailableVersions();
foreach (var ver in p.Split(','))
{
if (UmbracoVersion.AvailableVersions().ContainsKey(ver))
umbracoVersions.Add(UmbracoVersion.AvailableVersions()[ver]);
if (availableVersions.ContainsKey(ver))
umbracoVersions.Add(availableVersions[ver]);
}
return umbracoVersions;