diff --git a/src/Umbraco.Core/Constants-ObjectTypes.cs b/src/Umbraco.Core/Constants-ObjectTypes.cs index 81bd66928d..4f225aaccb 100644 --- a/src/Umbraco.Core/Constants-ObjectTypes.cs +++ b/src/Umbraco.Core/Constants-ObjectTypes.cs @@ -9,6 +9,16 @@ namespace Umbraco.Core /// public static class ObjectTypes { + /// + /// Guid for a doc type container + /// + public const string DocumentTypeContainer = "2F7A2769-6B0B-4468-90DD-AF42D64F7F16"; + + /// + /// Guid for a doc type container + /// + public const string MediaTypeContainer = "42AEF799-B288-4744-9B10-BE144B73CDC4"; + /// /// Guid for a Content Item object. /// diff --git a/src/Umbraco.Core/Models/PropertyType.cs b/src/Umbraco.Core/Models/PropertyType.cs index e9d4451314..239792bf08 100644 --- a/src/Umbraco.Core/Models/PropertyType.cs +++ b/src/Umbraco.Core/Models/PropertyType.cs @@ -9,6 +9,7 @@ using Umbraco.Core.Strings; namespace Umbraco.Core.Models { + /// /// Defines the type of a object /// diff --git a/src/Umbraco.Core/Models/UmbracoEntityExtensions.cs b/src/Umbraco.Core/Models/UmbracoEntityExtensions.cs index edcc25ade8..987be2a276 100644 --- a/src/Umbraco.Core/Models/UmbracoEntityExtensions.cs +++ b/src/Umbraco.Core/Models/UmbracoEntityExtensions.cs @@ -11,6 +11,20 @@ namespace Umbraco.Core.Models internal static class UmbracoEntityExtensions { + public static bool HasChildren(this IUmbracoEntity entity) + { + if (entity.AdditionalData.ContainsKey("HasChildren")) + { + var convert = entity.AdditionalData["HasChildren"].TryConvertTo(); + if (convert) + { + return convert.Result; + } + } + return false; + } + + public static object GetAdditionalDataValueIgnoreCase(this IUmbracoEntity entity, string key, object defaultVal) { if (entity.AdditionalData.ContainsKeyIgnoreCase(key) == false) return defaultVal; diff --git a/src/Umbraco.Core/Models/UmbracoObjectTypes.cs b/src/Umbraco.Core/Models/UmbracoObjectTypes.cs index 37ad181682..8f9acbd057 100644 --- a/src/Umbraco.Core/Models/UmbracoObjectTypes.cs +++ b/src/Umbraco.Core/Models/UmbracoObjectTypes.cs @@ -109,6 +109,13 @@ namespace Umbraco.Core.Models /// [UmbracoObjectTypeAttribute(Constants.ObjectTypes.DataType, typeof(IDataTypeDefinition))] [FriendlyName("Data Type")] - DataType + DataType, + + /// + /// Entity Container + /// + [UmbracoObjectTypeAttribute(Constants.ObjectTypes.DocumentTypeContainer)] + [FriendlyName("Document Type Container")] + DocumentTypeContainer } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs index 8dba129d93..17f9afe258 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs @@ -33,6 +33,66 @@ namespace Umbraco.Core.Persistence.Repositories { } + /// + /// The container object type - used for organizing content types + /// + protected abstract Guid ContainerObjectTypeId { get; } + + public Attempt CreateFolder(int parentId, string name, int userId) + { + name = name.Trim(); + + Mandate.ParameterNotNullOrEmpty(name, "name"); + + var exists = Database.FirstOrDefault( + new Sql().Select("*") + .From(SqlSyntax) + .Where(dto => dto.ParentId == parentId && dto.Text == name && dto.NodeObjectType == ContainerObjectTypeId)); + + if (exists != null) + { + return Attempt.Fail(exists.NodeId, new InvalidOperationException("A folder with the same name already exists")); + } + + var level = 0; + var path = "-1"; + if (parentId > -1) + { + var parent = Database.FirstOrDefault( + new Sql().Select("*") + .From(SqlSyntax) + .Where(dto => dto.NodeId == parentId && dto.NodeObjectType == ContainerObjectTypeId)); + + if (parent == null) + { + return Attempt.Fail(0, new NullReferenceException("No content type container found with parent id " + parentId)); + } + level = parent.Level; + path = parent.Path; + } + + var folder = new NodeDto + { + CreateDate = DateTime.Now, + Level = Convert.ToInt16(level + 1), + NodeObjectType = ContainerObjectTypeId, + ParentId = parentId, + Path = path, + SortOrder = 0, + Text = name, + Trashed = false, + UniqueId = Guid.NewGuid(), + UserId = userId + }; + + Database.Save(folder); + //update the path + folder.Path = folder.Path + "," + folder.NodeId; + Database.Save(folder); + + return Attempt.Succeed(folder.NodeId); + } + /// /// Returns the content type ids that match the query /// diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs index 40679af854..4db21a5616 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs @@ -242,6 +242,12 @@ namespace Umbraco.Core.Persistence.Repositories #endregion - + /// + /// The container object type - used for organizing content types + /// + protected override Guid ContainerObjectTypeId + { + get { return new Guid(Constants.ObjectTypes.DocumentTypeContainer); } + } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentTypeRepository.cs index e3ce084cf7..b612a9109d 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentTypeRepository.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using Umbraco.Core.Models; using Umbraco.Core.Persistence.Querying; @@ -18,5 +19,7 @@ namespace Umbraco.Core.Persistence.Repositories /// /// IEnumerable GetAllPropertyTypeAliases(); + + Attempt CreateFolder(int parentId, string name, int userId); } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs index cc51fd6e7c..13cdab400e 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs @@ -181,5 +181,13 @@ namespace Umbraco.Core.Persistence.Repositories } #endregion + + /// + /// The container object type - used for organizing content types + /// + protected override Guid ContainerObjectTypeId + { + get { throw new NotImplementedException(); } + } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs index bb6099a206..d9c8e815be 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs @@ -241,6 +241,14 @@ namespace Umbraco.Core.Persistence.Repositories #endregion + /// + /// The container object type - used for organizing content types + /// + protected override Guid ContainerObjectTypeId + { + get { throw new NotImplementedException(); } + } + /// /// Override so we can specify explicit db type's on any property types that are built-in. /// diff --git a/src/Umbraco.Core/Services/ContentTypeServiceBase.cs b/src/Umbraco.Core/Services/ContentTypeServiceBase.cs index d5ebaabdb6..d22ba90d5d 100644 --- a/src/Umbraco.Core/Services/ContentTypeServiceBase.cs +++ b/src/Umbraco.Core/Services/ContentTypeServiceBase.cs @@ -15,6 +15,14 @@ namespace Umbraco.Core.Services { } + public Attempt CreateFolder(int parentId, string name, int userId = 0) + { + using (var repo = RepositoryFactory.CreateContentTypeRepository(UowProvider.GetUnitOfWork())) + { + return repo.CreateFolder(parentId, name, userId); + } + } + /// /// This is called after an content type is saved and is used to update the content xml structures in the database /// if they are required to be updated. diff --git a/src/Umbraco.Core/Services/EntityService.cs b/src/Umbraco.Core/Services/EntityService.cs index 695d092bd4..1d249aa6d1 100644 --- a/src/Umbraco.Core/Services/EntityService.cs +++ b/src/Umbraco.Core/Services/EntityService.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using Umbraco.Core.Cache; using Umbraco.Core.CodeAnnotations; using Umbraco.Core.Logging; @@ -34,7 +35,28 @@ namespace Umbraco.Core.Services {typeof (IMedia).FullName, new Tuple>(UmbracoObjectTypes.Media, mediaService.GetById)}, {typeof (IMediaType).FullName, new Tuple>(UmbracoObjectTypes.MediaType, contentTypeService1.GetMediaType)}, {typeof (IMember).FullName, new Tuple>(UmbracoObjectTypes.Member, memberService.GetById)}, - {typeof (IMemberType).FullName, new Tuple>(UmbracoObjectTypes.MemberType, memberTypeService.Get)} + {typeof (IMemberType).FullName, new Tuple>(UmbracoObjectTypes.MemberType, memberTypeService.Get)}, + //{typeof (IUmbracoEntity).FullName, new Tuple>(UmbracoObjectTypes.EntityContainer, id => + //{ + // using (var uow = UowProvider.GetUnitOfWork()) + // { + // var found = uow.Database.FirstOrDefault("SELECT * FROM umbracoNode WHERE id=@id", new { id = id }); + // return found == null ? null : new UmbracoEntity(found.Trashed) + // { + // Id = found.NodeId, + // Name = found.Text, + // Key = found.UniqueId, + // SortOrder = found.SortOrder, + // Path = found.Path, + // NodeObjectTypeId = found.NodeObjectType.Value, + // CreateDate = found.CreateDate, + // CreatorId = found.UserId.Value, + // Level = found.Level, + // ParentId = found.ParentId + // }; + // } + + //})} }; } @@ -61,6 +83,7 @@ namespace Umbraco.Core.Services case UmbracoObjectTypes.DocumentType: case UmbracoObjectTypes.Member: case UmbracoObjectTypes.DataType: + case UmbracoObjectTypes.DocumentTypeContainer: return uow.Database.ExecuteScalar(new Sql().Select("id").From().Where(dto => dto.UniqueId == key)); case UmbracoObjectTypes.RecycleBin: case UmbracoObjectTypes.Stylesheet: diff --git a/src/Umbraco.Core/Services/IContentTypeService.cs b/src/Umbraco.Core/Services/IContentTypeService.cs index 9e2d179bb0..a538840e36 100644 --- a/src/Umbraco.Core/Services/IContentTypeService.cs +++ b/src/Umbraco.Core/Services/IContentTypeService.cs @@ -10,6 +10,8 @@ namespace Umbraco.Core.Services /// public interface IContentTypeService : IService { + Attempt CreateFolder(int parentId, string name, int userId = 0); + /// /// Gets all property type aliases. /// diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js index 48e7030571..461e2800e7 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js @@ -139,6 +139,14 @@ function contentTypeResource($q, $http, umbRequestHelper) { return umbRequestHelper.resourcePromise( $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "PostSave"), contentType), 'Failed to save data for content type id ' + contentType.id); + }, + + createFolder: function(parentId, name) { + + return umbRequestHelper.resourcePromise( + $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "PostCreateFolder", { parentId: parentId, name: name })), + 'Failed to create a folder under parent id ' + parentId); + } }; 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 ca31abb93c..b7c95d49c4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttype/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttype/create.html @@ -1,45 +1,51 @@ -
- -
-
Create a page under {{currentNode.name}}
+
-

- -

+
+
Create a page under {{currentNode.name}}
-
+ +
+
+ + + + + + +
+
- - {{docType.name}} - - {{docType.description}} - - - - - - -
- -
- + +
+
\ No newline at end of file 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 4a4c50b491..207f5eb07b 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 @@ -4,13 +4,42 @@ * @function * * @description - * The controller for the document type creation dialog + * The controller for the doc type creation dialog */ -function docTypeCreateController($scope, $routeParams, contentTypeResource, iconHelper) { +function contentCreateController($scope, $location, navigationService, contentTypeResource, formHelper, appState) { - contentTypeResource.getAllowedTypes($scope.currentNode.id).then(function(data) { - $scope.allowedTypes = iconHelper.formatContentTypeIcons(data); - }); + $scope.model = { + folderName: "", + creatingFolder: false + }; + + var node = $scope.dialogOptions.currentNode; + + $scope.showCreateFolder = function() { + $scope.model.creatingFolder = true; + } + + $scope.createFolder = function () { + if (formHelper.submitForm({ scope: $scope, formCtrl: this.createFolderForm, statusMessage: "Creating folder..." })) { + contentTypeResource.createFolder(node.id, $scope.model.folderName).then(function (folderId) { + + navigationService.hideMenu(); + var currPath = node.path ? node.path : "-1"; + navigationService.syncTree({ tree: "documenttype", path: currPath + "," + folderId, forceReload: true, activate: true }); + + $location.path("/documenttype/list/" + folderId); + + }, function(err) { + + //TODO: Handle errors + }); + }; + } + + $scope.createDocType = function() { + $location.path("/settings/documenttype/edit/-1").search("create", true); + navigationService.hideMenu(); + } } -angular.module('umbraco').controller("Umbraco.Editors.DocumentType.CreateController", docTypeCreateController); \ No newline at end of file +angular.module('umbraco').controller("Umbraco.Editors.DocumentType.CreateController", contentCreateController); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js index 1d6f3ed7a2..003268061c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js @@ -55,7 +55,7 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS if ($routeParams.id && $routeParams.id.length < 9) { entityResource.getById($routeParams.id, "Member").then(function(entity) { - $location.path("member/member/edit/" + entity.key); + $location.path("/member/member/edit/" + entity.key); }); } else { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js index 9c322f3f5d..71d84a8412 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js @@ -61,7 +61,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.ChangePasswordCont if (!isNew) { $scope.model.confirm = ""; } - else if ($scope.model.value.newPassword.length > 0) { + else if ($scope.model.value.newPassword && $scope.model.value.newPassword.length > 0) { //if it is new and a new password has been set, then set the confirm password too $scope.model.confirm = $scope.model.value.newPassword; } diff --git a/src/Umbraco.Web.UI/config/trees.config b/src/Umbraco.Web.UI/config/trees.config index eec71c2706..cf18abfa59 100644 --- a/src/Umbraco.Web.UI/config/trees.config +++ b/src/Umbraco.Web.UI/config/trees.config @@ -39,4 +39,6 @@ + + \ No newline at end of file diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs index fcc767a2f4..065f3f5b95 100644 --- a/src/Umbraco.Web/Editors/ContentTypeController.cs +++ b/src/Umbraco.Web/Editors/ContentTypeController.cs @@ -15,6 +15,7 @@ using Constants = Umbraco.Core.Constants; using Newtonsoft.Json; using Umbraco.Core.PropertyEditors; using System; +using System.Net.Http; namespace Umbraco.Web.Editors { @@ -159,11 +160,19 @@ namespace Umbraco.Web.Editors return basics; } + public HttpResponseMessage PostCreateFolder(int parentId, string name) + { + var result = Services.ContentTypeService.CreateFolder(parentId, name, Security.CurrentUser.Id); + + return result + ? Request.CreateResponse(HttpStatusCode.OK, result.Result) //return the id + : Request.CreateValidationErrorResponse(result.Exception.Message); + } public ContentTypeDisplay PostSave(ContentTypeDisplay contentType) { - var ctService = ApplicationContext.Services.ContentTypeService; + var ctService = Services.ContentTypeService; //TODO: warn on content type alias conflicts //TODO: warn on property alias conflicts diff --git a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs index 0c3b61d9eb..b5e0b5caf4 100644 --- a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs +++ b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs @@ -2,12 +2,14 @@ using System.Collections.Generic; using System.Linq; using System.Net; +using System.Net.Http; using System.Text.RegularExpressions; using System.Web.Http; using AutoMapper; using Newtonsoft.Json; using Umbraco.Core; using Umbraco.Core.Models; +using Umbraco.Core.Services; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Mvc; using Constants = Umbraco.Core.Constants; @@ -68,6 +70,7 @@ namespace Umbraco.Web.Editors throw new ArgumentOutOfRangeException(); } } - + + } } \ No newline at end of file diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs new file mode 100644 index 0000000000..24db7f6add --- /dev/null +++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs @@ -0,0 +1,89 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Http.Formatting; +using System.Text; +using System.Threading.Tasks; +using umbraco; +using umbraco.BusinessLogic.Actions; +using Umbraco.Core; +using Umbraco.Core.Models; +using Umbraco.Core.Models.EntityBase; +using Umbraco.Web.Models.Trees; +using Umbraco.Web.WebApi.Filters; +using Umbraco.Core.Services; + +namespace Umbraco.Web.Trees +{ + [UmbracoTreeAuthorize(Constants.Trees.DataTypes)] + [Tree(Constants.Applications.Settings, Constants.Trees.DocumentTypes, "Document Types")] + [Umbraco.Web.Mvc.PluginController("UmbracoTrees")] + [CoreTree] + public class ContentTypeTreeController : TreeController + { + protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings) + { + var intId = id.TryConvertTo(); + if (intId == false) throw new InvalidOperationException("Id must be an integer"); + + var nodes = new TreeNodeCollection(); + + 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("application") + TreeAlias.EnsureStartsWith('/') + "/list/" + dt.Id))); + + 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))); + + return nodes; + } + + + + protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings) + { + var menu = new MenuItemCollection(); + + if (id == Constants.System.Root.ToInvariantString()) + { + //set the default to create + menu.DefaultMenuAlias = ActionNew.Instance.Alias; + + // root actions + menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))); + menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias))); + return menu; + } + else + { + var container = Services.EntityService.Get(int.Parse(id), UmbracoObjectTypes.DocumentTypeContainer); + if (container != null) + { + //set the default to create + menu.DefaultMenuAlias = ActionNew.Instance.Alias; + + // root actions + menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))); + menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias))); + + if (container.HasChildren() == false) + { + //can delete doc type + menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias))); + } + } + else + { + //delete doc type + menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias))); + } + } + + return menu; + } + } +} diff --git a/src/Umbraco.Web/Trees/DocumentTypeTreeController.cs b/src/Umbraco.Web/Trees/DocumentTypeTreeController.cs deleted file mode 100644 index 1aef9c25a5..0000000000 --- a/src/Umbraco.Web/Trees/DocumentTypeTreeController.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net.Http.Formatting; -using System.Text; -using System.Threading.Tasks; -using umbraco; -using umbraco.BusinessLogic.Actions; -using Umbraco.Core; -using Umbraco.Web.Models.Trees; -using Umbraco.Web.WebApi.Filters; -using Umbraco.Core.Services; - -namespace Umbraco.Web.Trees -{ - [UmbracoTreeAuthorize(Constants.Trees.DataTypes)] - [Tree(Constants.Applications.Settings, Constants.Trees.DocumentTypes, "Document Types")] - [Umbraco.Web.Mvc.PluginController("UmbracoTrees")] - [CoreTree] - public class DocumentTypeTreeController : TreeController - { - protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings) - { - var nodes = new TreeNodeCollection(); - nodes.AddRange( - Services.ContentTypeService.GetAllContentTypes() - .OrderBy(x => x.Name) - .Select(dt => CreateTreeNode(dt.Id.ToString(), id, queryStrings, dt.Name, "icon-item-arrangement", false))); - - return nodes; - } - - protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings) - { - var menu = new MenuItemCollection(); - - if (id == Constants.System.Root.ToInvariantString()) - { - // root actions - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))); - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias))); - return menu; - } - else - { - //delete doc type - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias))); - } - - return menu; - } - } -} diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 4cedd9d5b7..46df94a623 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -311,7 +311,7 @@ - +