yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes auth with AllowsCultureVariation and LanguageController post methods, fixes merge issues with navigation.controller

Browse Source
This commit is contained in:
Shannon
2018-05-10 19:16:46 +10:00
parent 573b8a0701
commit 68f0a64136
10 changed files with 192 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Umbraco.Web/Trees/ContentTreeController.cs
View File

@@ -257,24 +257,22 @@ namespace Umbraco.Web.Trees
return;
}
if (entity is IDocumentEntitySlim docEntity)
if (!(entity is IDocumentEntitySlim docEntity))
throw new InvalidOperationException($"Cannot render a tree node for a culture when the entity isn't {typeof(IDocumentEntitySlim)}, instead it is {entity.GetType()}");
// we are getting the tree for a given culture,
// for those items that DO support cultures, we need to get the proper name, IF it exists
// otherwise, invariant is fine
if (docEntity.Variations.Has(Core.Models.ContentVariation.CultureNeutral) &&
docEntity.CultureNames.TryGetValue(culture, out var name) &&
!string.IsNullOrWhiteSpace(name))
{
// we are getting the tree for a given culture,
// for those items that DO support cultures, we need to get the proper name, IF it exists
// otherwise, invariant is fine
if (docEntity.Variations.Has(Core.Models.ContentVariation.CultureNeutral) &&
docEntity.CultureNames.TryGetValue(culture, out var name) &&
!string.IsNullOrWhiteSpace(name))
{
entity.Name = name;
}
if (string.IsNullOrWhiteSpace(entity.Name))
entity.Name = "[[" + entity.Id + "]]";
entity.Name = name;
}
throw new InvalidOperationException($"Cannot render a tree node for a culture when the entity isn't {typeof(IDocumentEntitySlim)}, instead it is {entity.GetType()}");
if (string.IsNullOrWhiteSpace(entity.Name))
entity.Name = "[[" + entity.Id + "]]";
}
private void AddActionNode<TAction>(IUmbracoEntity item, MenuItemCollection menu, bool hasSeparator = false, bool convert = false)