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

Fixes: U4-3737 macro container make sure you can define the allowed macros + the max number

Browse Source
This commit is contained in:
Shannon
2014-11-13 17:44:03 +11:00
parent 9019c49ee8
commit 6df6e3bdad
9 changed files with 68 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web/Trees/ApplicationTreeRegistrar.cs
View File

@@ -53,16 +53,14 @@ namespace Umbraco.Web.Trees
//convert them to ApplicationTree instances
var legacyItems = legacyTreeTypes
.Select(x =>
new Tuple<Type, global::umbraco.businesslogic.TreeAttribute, ObsoleteAttribute>(
new Tuple<Type, global::umbraco.businesslogic.TreeAttribute>(
x,
x.GetCustomAttributes<global::umbraco.businesslogic.TreeAttribute>(false).SingleOrDefault(),
x.GetCustomAttributes<global::umbraco.businesslogic.TreeAttribute>(false).SingleOrDefault()))
x.GetCustomAttributes<ObsoleteAttribute>(false).SingleOrDefault()))
//ensure that the legacy tree attribute exists
new Tuple<Type, global::umbraco.businesslogic.TreeAttribute, ObsoleteAttribute>(
x,
x.GetCustomAttributes<global::umbraco.businesslogic.TreeAttribute>(false).SingleOrDefault(),
x.GetCustomAttributes<ObsoleteAttribute>(false).SingleOrDefault()))
//ensure that the legacy tree attribute exists
.Where(x => x.Item2 != null)
//ensure that it's not obsoleted, any obsoleted tree will not be auto added to the config
.Where(x => x.Item3 == null)
//ensure that it's not obsoleted, any obsoleted tree will not be auto added to the config
.Where(x => x.Item3 == null)
//make sure the legacy tree isn't added on top of the controller tree!
.Where(x => added.InvariantContains(x.Item2.Alias) == false)
.Select(x => new ApplicationTree(x.Item2.Initialize, x.Item2.SortOrder, x.Item2.ApplicationAlias, x.Item2.Alias, x.Item2.Title, x.Item2.IconClosed, x.Item2.IconOpen, x.Item1.GetFullNameWithAssembly()));