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

First attempt at getting legacy tree dialog to work with new trees. Just saving this revision since I might need to reference the code later but am going to revert since this doesn't seem like the way to go.

Browse Source
This commit is contained in:
Shannon
2013-09-04 12:01:41 +10:00
parent 91de4ebd42
commit f6ea604101
7 changed files with 106 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs
View File

@@ -22,7 +22,7 @@ namespace Umbraco.Web.Trees
internal static class ApplicationTreeExtensions
{
private static Attempt<Type> TryGetControllerTree(this ApplicationTree appTree)
internal static Attempt<Type> TryGetControllerTree(this ApplicationTree appTree)
{
//get reference to all TreeApiControllers
var controllerTrees = UmbracoApiControllerResolver.Current.RegisteredUmbracoApiControllers
@@ -38,7 +38,7 @@ namespace Umbraco.Web.Trees
return new Attempt<Type>(true, foundControllerTree);
}
internal static Attempt<TreeNode> TryGetRootNodeFromControllerTree(this ApplicationTree appTree, FormDataCollection formCollection, HttpControllerContext controllerContext, HttpRequestMessage request)
internal static Attempt<TreeNode> TryGetRootNodeFromControllerTree(this ApplicationTree appTree, FormDataCollection formCollection, HttpControllerContext controllerContext)
{
var foundControllerTreeAttempt = appTree.TryGetControllerTree();
if (foundControllerTreeAttempt.Success == false)
@@ -49,7 +49,7 @@ namespace Umbraco.Web.Trees
//instantiate it, since we are proxying, we need to setup the instance with our current context
var instance = (TreeApiController)DependencyResolver.Current.GetService(foundControllerTree);
instance.ControllerContext = controllerContext;
instance.Request = request;
instance.Request = controllerContext.Request;
//return the root
var node = instance.GetRootNode(formCollection);
return node == null
@@ -57,7 +57,7 @@ namespace Umbraco.Web.Trees
: new Attempt<TreeNode>(true, node);
}
internal static Attempt<TreeNodeCollection> TryLoadFromControllerTree(this ApplicationTree appTree, string id, FormDataCollection formCollection, HttpControllerContext controllerContext, HttpRequestMessage request)
internal static Attempt<TreeNodeCollection> TryLoadFromControllerTree(this ApplicationTree appTree, string id, FormDataCollection formCollection, HttpControllerContext controllerContext)
{
var foundControllerTreeAttempt = appTree.TryGetControllerTree();
if (foundControllerTreeAttempt.Success == false)
@@ -69,7 +69,7 @@ namespace Umbraco.Web.Trees
//instantiate it, since we are proxying, we need to setup the instance with our current context
var instance = (TreeApiController)DependencyResolver.Current.GetService(foundControllerTree);
instance.ControllerContext = controllerContext;
instance.Request = request;
instance.Request = controllerContext.Request;
//return it's data
return new Attempt<TreeNodeCollection>(true, instance.GetNodes(id, formCollection));
}
@@ -99,7 +99,7 @@ namespace Umbraco.Web.Trees
return new Attempt<XmlTreeNode>(true, bTree.RootNode);
}
private static Attempt<TreeDefinition> TryGetLegacyTreeDef(this ApplicationTree appTree)
internal static Attempt<TreeDefinition> TryGetLegacyTreeDef(this ApplicationTree appTree)
{
//This is how the legacy trees worked....
var treeDef = TreeDefinitionCollection.Instance.FindTree(appTree.Alias);