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

Rolls back listview items in dialog trees

Browse Source
This commit is contained in:
perploug
2014-01-28 15:49:04 +01:00
parent 06cbdc37b4
commit 24062c0061
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,8 +98,7 @@ namespace Umbraco.Web.Trees
{
//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(),

4
src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
View File

@@ -177,8 +177,8 @@ namespace Umbraco.Web.Trees
//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();

2
src/Umbraco.Web/Trees/MediaTreeController.cs
View File

@@ -78,7 +78,7 @@ namespace Umbraco.Web.Trees
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(),