Rolls back listview items in dialog trees

perploug · perploug · commit 24062c0061ac · 2014-01-28T15:49:04.000+01:00
diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -98,8 +98,7 @@ protected override TreeNode GetSingleTreeNode(IUmbracoEntity e, string parentId,
             {
 
                 //Special check to see if it ia a container, if so then we'll hide children.
-                //we only perform this check for non-dialog trees since pickers needs access to these nodes
-                var isContainer = e.IsContainer() && (queryStrings.Get("isDialog") != "true");
+                var isContainer = e.IsContainer();   // && (queryStrings.Get("isDialog") != "true");
 
                 var node = CreateTreeNode(
                     e.Id.ToInvariantString(),
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -177,8 +177,8 @@ private TreeNodeCollection GetTreeNodesInternal(string id, FormDataCollection qu
             //before we get the children we need to see if this is a container node
             var current = Services.EntityService.Get(int.Parse(id), UmbracoObjectType);
 
-
-            if (queryStrings.Get("isDialog") != "true" && current != null && current.IsContainer())
+            //test if the parent is a listview / container
+            if (current != null && current.IsContainer())
             {
                 //no children!
                 return new TreeNodeCollection();
diff --git a/src/Umbraco.Web/Trees/MediaTreeController.cs b/src/Umbraco.Web/Trees/MediaTreeController.cs
@@ -78,7 +78,7 @@ protected override TreeNode GetSingleTreeNode(IUmbracoEntity e, string parentId,
             var entity = (UmbracoEntity)e;
 
             //Special check to see if it ia a container, if so then we'll hide children.
-            var isContainer = e.IsContainer() && (queryStrings.Get("isDialog") != "true");
+            var isContainer = e.IsContainer(); // && (queryStrings.Get("isDialog") != "true");
 
             var node = CreateTreeNode(
                 e.Id.ToInvariantString(),

Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,7 @@ protected override TreeNode GetSingleTreeNode(IUmbracoEntity e, string parentId,`
`98`	`98`	`{`
`99`	`99`
`100`	`100`	`//Special check to see if it ia a container, if so then we'll hide children.`
`101`		`- //we only perform this check for non-dialog trees since pickers needs access to these nodes`
`102`		`- var isContainer = e.IsContainer() && (queryStrings.Get("isDialog") != "true");`
	`101`	`+ var isContainer = e.IsContainer(); // && (queryStrings.Get("isDialog") != "true");`
`103`	`102`
`104`	`103`	`var node = CreateTreeNode(`
`105`	`104`	`e.Id.ToInvariantString(),`