From 4e4382ff90e4d3c0afe5722eb9afd74480c7cd4a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 8 Jun 2015 18:22:43 +0200
Subject: [PATCH] folders are more or less working.

---
 .../src/common/resources/membertype.resource.js  |  2 +-
 .../src/views/documenttype/create.html           |  2 +-
 .../documenttype.create.controller.js            |  6 +++++-
 .../src/views/documenttype/edit.controller.js    |  2 +-
 .../Trees/ContentTypeTreeController.cs           | 16 +++++++++++++---
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js
index d313fc6c4a..5d562ae381 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js
@@ -39,7 +39,7 @@ function memberTypeResource($q, $http, umbRequestHelper) {
                'Failed to retrieve content type');
         },
 
-        getEmpty: function () {
+        getScaffold: function () {
 
             return umbRequestHelper.resourcePromise(
                $http.get(
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttype/create.html b/src/Umbraco.Web.UI.Client/src/views/documenttype/create.html
index b7c95d49c4..5d83b3cdf0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttype/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttype/create.html
@@ -35,7 +35,7 @@
               val-form-manager>
 
             <umb-control-group label="Enter a folder name" hide-label="false">
-                <input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" required />                
+                <input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" required />
             </umb-control-group>
 
             <button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttype/documenttype.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttype/documenttype.create.controller.js
index 207f5eb07b..6d993a7a8e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttype/documenttype.create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttype/documenttype.create.controller.js
@@ -27,7 +27,11 @@ function contentCreateController($scope, $location, navigationService, contentTy
                 var currPath = node.path ? node.path : "-1";
                 navigationService.syncTree({ tree: "documenttype", path: currPath + "," + folderId, forceReload: true, activate: true });
 
-                $location.path("/documenttype/list/" + folderId);
+                formHelper.resetForm({ scope: $scope });
+
+                var section = appState.getSectionState("currentSection");
+
+                $location.path("/" + section + "/documenttype/list/" + folderId);
 
             }, function(err) {
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttype/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttype/edit.controller.js
index d90c60d586..3a06db5480 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttype/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttype/edit.controller.js
@@ -53,7 +53,7 @@ function DocumentTypeEditController($scope, $rootScope, $routeParams, $log, cont
 
 	if ($routeParams.create) {
         //we are creating so get an empty data type item
-        contentTypeResource.getEmpty()
+	    contentTypeResource.getScaffold()
             .then(function(dt) {
             	init(dt);
             });
diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
index 24db7f6add..dbe9f3dfec 100644
--- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
@@ -31,13 +31,23 @@ namespace Umbraco.Web.Trees
             nodes.AddRange(
                 Services.EntityService.GetChildren(intId.Result, UmbracoObjectTypes.DocumentTypeContainer)
                     .OrderBy(entity => entity.Name)
-                    .Select(dt => CreateTreeNode(dt.Id.ToString(), id, queryStrings, dt.Name, "icon-folder", dt.HasChildren(),
-                        queryStrings.GetValue<string>("application") + TreeAlias.EnsureStartsWith('/') + "/list/" + dt.Id)));
+                    .Select(dt =>
+                    {
+                        var node = CreateTreeNode(dt.Id.ToString(), id, queryStrings, dt.Name, "icon-folder", dt.HasChildren(),
+                            queryStrings.GetValue<string>("application") + TreeAlias.EnsureStartsWith('/') + "/list/" + dt.Id);
+                        node.Path = dt.Path;
+                        return node;
+                    }));
 
             nodes.AddRange(
                 Services.EntityService.GetChildren(intId.Result, UmbracoObjectTypes.DocumentType)
                     .OrderBy(entity => entity.Name)
-                    .Select(dt => CreateTreeNode(dt.Id.ToString(), id, queryStrings, dt.Name, "icon-item-arrangement", false)));
+                    .Select(dt =>
+                    {
+                        var node = CreateTreeNode(dt.Id.ToString(), id, queryStrings, dt.Name, "icon-item-arrangement", false);
+                        node.Path = dt.Path;
+                        return node;
+                    }));
 
             return nodes;
         }