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

Updates some naming conventions and code formatting

Browse Source
This commit is contained in:
Shannon
2014-08-08 12:08:34 -06:00
parent 1449966537
commit fa4a268556
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,26 +132,25 @@ namespace Umbraco.Web.Trees
//user permission override root //user permission override root
if (hasUserRoot) if (hasUserRoot)
idToLoad = UserStartNode.ToString(); idToLoad = UserStartNode.ToString(CultureInfo.InvariantCulture);
//tree overrides root //tree overrides root
if (hasTreeRoot) if (hasTreeRoot)
{ {
//but only if the user is allowed to access this node //but only if the user is allowed to access this node
var _id = queryStrings.GetValue<string>(TreeQueryStringParameters.StartNodeId); var altId = queryStrings.GetValue<string>(TreeQueryStringParameters.StartNodeId);
//so if we dont have a user content root or the user has access //so if we dont have a user content root or the user has access
if (!hasUserRoot || HasPathAccess(_id, queryStrings)) if (hasUserRoot == false || HasPathAccess(altId, queryStrings))
{ {
idToLoad = _id; idToLoad = altId;
} }
} }
//load whatever root nodes we concluded was the user/tree root //load whatever root nodes we concluded was the user/tree root
var nodes = new TreeNodeCollection(); var nodes = GetTreeNodesInternal(idToLoad, queryStrings);
nodes = GetTreeNodesInternal(idToLoad, queryStrings);
//only render the recycle bin if we are not in dialog and the start id id still the root //only render the recycle bin if we are not in dialog and the start id is still the root
if (IsDialog(queryStrings) == false && idToLoad == Constants.System.Root.ToInvariantString()) if (IsDialog(queryStrings) == false && idToLoad == Constants.System.Root.ToInvariantString())
{ {
nodes.Add(CreateTreeNode( nodes.Add(CreateTreeNode(