diff --git a/src/Umbraco.Core/Models/UmbracoObjectTypes.cs b/src/Umbraco.Core/Models/UmbracoObjectTypes.cs index e4121a22a1..e04e20ff0a 100644 --- a/src/Umbraco.Core/Models/UmbracoObjectTypes.cs +++ b/src/Umbraco.Core/Models/UmbracoObjectTypes.cs @@ -85,7 +85,7 @@ namespace Umbraco.Core.Models /// /// Recycle Bin /// - [UmbracoObjectTypeAttribute(Constants.ObjectTypes.RecycleBin)] + [UmbracoObjectTypeAttribute(Constants.ObjectTypes.ContentRecycleBin)] [FriendlyName("Recycle Bin")] RecycleBin, diff --git a/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs b/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs index c73f94043e..7fc81b1db7 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs @@ -100,8 +100,8 @@ namespace Umbraco.Core.Persistence.Migrations.Initial private void CreateUmbracNodeData() { _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -1, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1", SortOrder = 0, UniqueId = new Guid("916724a5-173d-4619-b97e-b9de133dd6f5"), Text = "SYSTEM DATA: umbraco master root", NodeObjectType = new Guid(Constants.ObjectTypes.SystemRoot), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -20, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,-20", SortOrder = 0, UniqueId = new Guid("0F582A79-1E41-4CF0-BFA0-76340651891A"), Text = "Recycle Bin", NodeObjectType = new Guid(Constants.ObjectTypes.RecycleBin), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -21, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,-21", SortOrder = 0, UniqueId = new Guid("BF7C7CBC-952F-4518-97A2-69E9C7B33842"), Text = "Recycle Bin", NodeObjectType = new Guid("CF3D8E34-1C1C-41e9-AE56-878B57B32113"), CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -20, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,-20", SortOrder = 0, UniqueId = new Guid("0F582A79-1E41-4CF0-BFA0-76340651891A"), Text = "Recycle Bin", NodeObjectType = new Guid(Constants.ObjectTypes.ContentRecycleBin), CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -21, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,-21", SortOrder = 0, UniqueId = new Guid("BF7C7CBC-952F-4518-97A2-69E9C7B33842"), Text = "Recycle Bin", NodeObjectType = new Guid(Constants.ObjectTypes.MediaRecycleBin), CreateDate = DateTime.Now }); _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -92, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-92", SortOrder = 35, UniqueId = new Guid("f0bc4bfb-b499-40d6-ba86-058885a5178c"), Text = "Label", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -90, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-90", SortOrder = 34, UniqueId = new Guid("84c6b441-31df-4ffe-b67e-67d5bc3ae65a"), Text = "Upload", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -89, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-89", SortOrder = 33, UniqueId = new Guid("c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3"), Text = "Textbox multiple", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); @@ -117,9 +117,9 @@ namespace Umbraco.Core.Persistence.Migrations.Initial _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -38, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-38", SortOrder = 2, UniqueId = new Guid("fd9f1447-6c61-4a7c-9595-5aa39147d318"), Text = "Folder Browser", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -37, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-37", SortOrder = 2, UniqueId = new Guid("0225af17-b302-49cb-9176-b9f35cab9c17"), Text = "Approved Color", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -36, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-36", SortOrder = 2, UniqueId = new Guid("e4d66c0f-b935-4200-81f0-025f7256b89a"), Text = "Date Picker with time", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1031, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1031", SortOrder = 2, UniqueId = new Guid("f38bd2d7-65d0-48e6-95dc-87ce06ec2d3d"), Text = "Folder", NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1032, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1032", SortOrder = 2, UniqueId = new Guid("cc07b313-0843-4aa8-bbda-871c8da728c8"), Text = "Image", NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1033, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1033", SortOrder = 2, UniqueId = new Guid("4c52d8ab-54e6-40cd-999c-7a5f24903e4d"), Text = "File", NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1031, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1031", SortOrder = 2, UniqueId = new Guid("f38bd2d7-65d0-48e6-95dc-87ce06ec2d3d"), Text = Constants.Conventions.MediaTypes.Folder, NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1032, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1032", SortOrder = 2, UniqueId = new Guid("cc07b313-0843-4aa8-bbda-871c8da728c8"), Text = Constants.Conventions.MediaTypes.Image, NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1033, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1033", SortOrder = 2, UniqueId = new Guid("4c52d8ab-54e6-40cd-999c-7a5f24903e4d"), Text = Constants.Conventions.MediaTypes.File, NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now }); _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1034, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1034", SortOrder = 2, UniqueId = new Guid("a6857c73-d6e9-480c-b6e6-f15f6ad11125"), Text = "Content Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1035, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1035", SortOrder = 2, UniqueId = new Guid("93929b9a-93a2-4e2a-b239-d99334440a59"), Text = "Media Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1036, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1036", SortOrder = 2, UniqueId = new Guid("2b24165f-9782-4aa3-b459-1de4a4d21f60"), Text = "Member Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); @@ -133,9 +133,9 @@ namespace Umbraco.Core.Persistence.Migrations.Initial private void CreateCmsContentTypeData() { - _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 532, NodeId = 1031, Alias = "Folder", Icon = "folder.gif", Thumbnail = "folder.png", IsContainer = true, AllowAtRoot = true }); - _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 533, NodeId = 1032, Alias = "Image", Icon = "mediaPhoto.gif", Thumbnail = "mediaPhoto.png" }); - _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 534, NodeId = 1033, Alias = "File", Icon = "mediaFile.gif", Thumbnail = "mediaFile.png" }); + _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 532, NodeId = 1031, Alias = Constants.Conventions.MediaTypes.Folder, Icon = "folder.gif", Thumbnail = "folder.png", IsContainer = true, AllowAtRoot = true }); + _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 533, NodeId = 1032, Alias = Constants.Conventions.MediaTypes.Image, Icon = "mediaPhoto.gif", Thumbnail = "mediaPhoto.png" }); + _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 534, NodeId = 1033, Alias = Constants.Conventions.MediaTypes.File, Icon = "mediaFile.gif", Thumbnail = "mediaFile.png" }); } private void CreateUmbracoUserData() @@ -154,12 +154,12 @@ namespace Umbraco.Core.Persistence.Migrations.Initial private void CreateUmbracoUser2AppData() { - _database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = "content" }); - _database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = "developer" }); - _database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = "media" }); - _database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = "member" }); - _database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = "settings" }); - _database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = "users" }); + _database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = Constants.Applications.Content }); + _database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = Constants.Applications.Developer }); + _database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = Constants.Applications.Media }); + _database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = Constants.Applications.Members }); + _database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = Constants.Applications.Settings }); + _database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = Constants.Applications.Users }); } private void CreateCmsMacroPropertyTypeData() diff --git a/src/Umbraco.Tests/BusinessLogic/ApplicationTest.cs b/src/Umbraco.Tests/BusinessLogic/ApplicationTest.cs index 05bef30a32..1bcd405c67 100644 --- a/src/Umbraco.Tests/BusinessLogic/ApplicationTest.cs +++ b/src/Umbraco.Tests/BusinessLogic/ApplicationTest.cs @@ -2,6 +2,7 @@ using umbraco.BusinessLogic; using System; using System.Linq; +using Umbraco.Core; namespace Umbraco.Tests.BusinessLogic { @@ -48,9 +49,9 @@ namespace Umbraco.Tests.BusinessLogic //var app = Application.getAll().First(); //assign the app - user.addApplication("content"); + user.addApplication(Constants.Applications.Content); //ensure it's added - Assert.AreEqual(1, user.Applications.Count(x => x.alias == "content")); + Assert.AreEqual(1, user.Applications.Count(x => x.alias == Constants.Applications.Content)); //delete the user user.delete(); diff --git a/src/Umbraco.Tests/BusinessLogic/BaseTest.cs b/src/Umbraco.Tests/BusinessLogic/BaseTest.cs index ad727d1df7..1ea9110f5d 100644 --- a/src/Umbraco.Tests/BusinessLogic/BaseTest.cs +++ b/src/Umbraco.Tests/BusinessLogic/BaseTest.cs @@ -73,7 +73,7 @@ namespace Umbraco.Tests.BusinessLogic { Application.Apps = new List() { - new Application("content", "content", "content", 0) + new Application(Constants.Applications.Content, "content", "content", 0) }; } diff --git a/src/Umbraco.Tests/LegacyApi/MediaTypeTests.cs b/src/Umbraco.Tests/LegacyApi/MediaTypeTests.cs index ca7216220c..6664d86eb8 100644 --- a/src/Umbraco.Tests/LegacyApi/MediaTypeTests.cs +++ b/src/Umbraco.Tests/LegacyApi/MediaTypeTests.cs @@ -25,7 +25,7 @@ namespace Umbraco.Tests.LegacyApi public void Can_Verify_AllowedChildContentTypes_On_MediaType() { // Arrange - var folder = MediaType.GetByAlias("Folder"); + var folder = MediaType.GetByAlias(Constants.Conventions.MediaTypes.Folder); var folderStructure = folder.AllowedChildContentTypeIDs.ToList(); folderStructure.Add(1045); @@ -34,7 +34,7 @@ namespace Umbraco.Tests.LegacyApi folder.Save(); // Assert - var updated = MediaType.GetByAlias("Folder"); + var updated = MediaType.GetByAlias(Constants.Conventions.MediaTypes.Folder); Assert.That(updated.AllowedChildContentTypeIDs.Any(), Is.True); Assert.That(updated.AllowedChildContentTypeIDs.Any(x => x == 1045), Is.True); diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs index 1aacaef52d..71351a6489 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs @@ -129,7 +129,7 @@ namespace Umbraco.Tests.Persistence.Repositories // Assert Assert.That(mediaType, Is.Not.Null); Assert.That(mediaType.Id, Is.EqualTo(1033)); - Assert.That(mediaType.Name, Is.EqualTo("File")); + Assert.That(mediaType.Name, Is.EqualTo(Constants.Conventions.MediaTypes.File)); } [Test] diff --git a/src/Umbraco.Tests/PublishedCache/PublishedMediaCacheTests.cs b/src/Umbraco.Tests/PublishedCache/PublishedMediaCacheTests.cs index 929e88322f..8d75b197d3 100644 --- a/src/Umbraco.Tests/PublishedCache/PublishedMediaCacheTests.cs +++ b/src/Umbraco.Tests/PublishedCache/PublishedMediaCacheTests.cs @@ -138,12 +138,12 @@ namespace Umbraco.Tests.PublishedCache }; result.Fields.Add("__IndexType", "media"); result.Fields.Add("__NodeId", "1234"); - result.Fields.Add("__NodeTypeAlias", "Image"); + result.Fields.Add("__NodeTypeAlias", Constants.Conventions.MediaTypes.Image); result.Fields.Add("__Path", "-1,1234"); result.Fields.Add("__nodeName", "Test"); result.Fields.Add("id", "1234"); result.Fields.Add("nodeName", "Test"); - result.Fields.Add("nodeTypeAlias", "Image"); + result.Fields.Add("nodeTypeAlias", Constants.Conventions.MediaTypes.Image); result.Fields.Add("parentID", "-1"); result.Fields.Add("path", "-1,1234"); result.Fields.Add("updateDate", "2012-07-16T10:34:09"); diff --git a/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs b/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs index d68ba70f32..1c7f2a39e6 100644 --- a/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs +++ b/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs @@ -149,14 +149,14 @@ namespace Umbraco.Tests.Services //create 2 content items string name1 = "test" + Guid.NewGuid(); - var folder1 = mediaService.CreateMedia(name1, -1, "Folder", 0); + var folder1 = mediaService.CreateMedia(name1, -1, Constants.Conventions.MediaTypes.Folder, 0); Debug.WriteLine("Saving folder1 on thread: " + Thread.CurrentThread.ManagedThreadId); mediaService.Save(folder1, 0); Thread.Sleep(100); //quick pause for maximum overlap! string name = "test" + Guid.NewGuid(); - var folder2 = mediaService.CreateMedia(name, -1, "Folder", 0); + var folder2 = mediaService.CreateMedia(name, -1, Constants.Conventions.MediaTypes.Folder, 0); Debug.WriteLine("Saving folder2 on thread: " + Thread.CurrentThread.ManagedThreadId); mediaService.Save(folder2, 0); } diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs b/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs index 49176dfb5d..92e2ecd90d 100644 --- a/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs +++ b/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs @@ -196,7 +196,7 @@ namespace Umbraco.Tests.TestHelpers.Entities { var mediaType = new MediaType(-1) { - Alias = "image", + Alias = Constants.Conventions.MediaTypes.Image, Name = "Image", Description = "ContentType used for images", Icon = ".sprTreeDoc3", diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index 149a962eaf..f0df81e8d7 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -447,11 +447,11 @@ ResXFileCodeGenerator ImportResources.Designer.cs - + ResXFileCodeGenerator TestFiles.Designer.cs + Designer - diff --git a/src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs b/src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs index f1aa3be798..f81688f47f 100644 --- a/src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs +++ b/src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs @@ -8,6 +8,7 @@ using System.Web; using System.Web.UI; using Umbraco.Core.IO; using umbraco; +using Umbraco.Core; namespace Umbraco.Web.UI.Umbraco { @@ -18,7 +19,7 @@ namespace Umbraco.Web.UI.Umbraco protected void Page_Load(object sender, System.EventArgs e) { var apps = UmbracoUser.Applications.ToList(); - bool userHasAccesstodefaultApp = apps.Any(x => x.alias == "content"); + bool userHasAccesstodefaultApp = apps.Any(x => x.alias == Constants.Applications.Content); // Load user module icons .. if (apps.Count() > 1) @@ -64,7 +65,7 @@ namespace Umbraco.Web.UI.Umbraco } else { - DefaultApp = "content"; + DefaultApp = Constants.Applications.Content; } diff --git a/src/Umbraco.Web/Trees/PartialViewMacrosTree.cs b/src/Umbraco.Web/Trees/PartialViewMacrosTree.cs index a756cd5685..777b4cb5db 100644 --- a/src/Umbraco.Web/Trees/PartialViewMacrosTree.cs +++ b/src/Umbraco.Web/Trees/PartialViewMacrosTree.cs @@ -2,13 +2,14 @@ using Umbraco.Core.IO; using umbraco.businesslogic; using umbraco.cms.presentation.Trees; +using Umbraco.Core; namespace Umbraco.Web.Trees { /// /// Tree for displaying partial view macros in the developer app /// - [Tree("developer", "partialViewMacros", "Partial View Macro Files", sortOrder: 6)] + [Tree(Constants.Applications.Developer, "partialViewMacros", "Partial View Macro Files", sortOrder: 6)] public class PartialViewMacrosTree : PartialViewsTree { public PartialViewMacrosTree(string application) : base(application) diff --git a/src/Umbraco.Web/Trees/PartialViewsTree.cs b/src/Umbraco.Web/Trees/PartialViewsTree.cs index dffba223da..dba21b129a 100644 --- a/src/Umbraco.Web/Trees/PartialViewsTree.cs +++ b/src/Umbraco.Web/Trees/PartialViewsTree.cs @@ -18,7 +18,7 @@ namespace Umbraco.Web.Trees /// /// Tree for displaying partial views in the settings app /// - [Tree("settings", "partialViews", "Partial Views", sortOrder: 2)] + [Tree(Constants.Applications.Settings, "partialViews", "Partial Views", sortOrder: 2)] public class PartialViewsTree : FileSystemTree { public PartialViewsTree(string application) : base(application) { } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs index 6f460db3d1..a61fa2e2fd 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs @@ -97,7 +97,7 @@ namespace umbraco.presentation.LiveEditing.Controls { // SKINNING // verify access to settings area - if (User.GetCurrent().GetApplications().Find(t => t.alias.ToLower() == "settings") != null) + if (User.GetCurrent().GetApplications().Find(t => string.Equals(t.alias, Umbraco.Core.Constants.Applications.Settings, StringComparison.OrdinalIgnoreCase)) != null) { //only add if there is a skin NodeFactory.Node n = NodeFactory.Node.GetCurrent(); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.cs index 125cfa9b51..629e063baf 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.cs @@ -7,6 +7,7 @@ using System.Web.UI.WebControls; using Umbraco.Core.Logging; using umbraco.BusinessLogic; using umbraco.cms.businesslogic.packager; +using Umbraco.Core; namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule { @@ -23,7 +24,7 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule protected void Page_Load(object sender, EventArgs e) { - if (User.GetCurrent().GetApplications().Find(t => t.alias.ToLower() == "settings") == null) + if (User.GetCurrent().GetApplications().Find(t => string.Equals(t.alias, Constants.Applications.Settings, StringComparison.OrdinalIgnoreCase)) == null) { throw new Exception("The current user can't edit skins as the user doesn't have access to the Settings section!"); } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs index e86fa30eb9..75194be3b2 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs @@ -15,6 +15,7 @@ using umbraco.BusinessLogic; using umbraco.NodeFactory; using umbraco.cms.businesslogic.packager; using System.IO; +using Umbraco.Core; namespace umbraco.presentation.LiveEditing.Modules.SkinModule { @@ -227,7 +228,7 @@ namespace umbraco.presentation.LiveEditing.Modules.SkinModule protected void Page_Load(object sender, EventArgs e) { - if (User.GetCurrent().GetApplications().Find(t => t.alias.ToLower() == "settings") == null) + if (User.GetCurrent().GetApplications().Find(t => string.Equals(t.alias, Constants.Applications.Settings, StringComparison.OrdinalIgnoreCase)) == null) { throw new Exception("The current user can't edit skins as the user doesn't have access to the Settings section!"); } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs index 23385d984b..2950f072bc 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs @@ -11,6 +11,7 @@ using UmbracoExamine; using System.Web.Script.Serialization; using Examine; using Examine.LuceneEngine.SearchCriteria; +using Umbraco.Core; namespace umbraco.presentation.umbraco.Search { @@ -44,7 +45,7 @@ namespace umbraco.presentation.umbraco.Search } //if it doesn't start with "*", then search only nodeName and nodeId - var internalSearcher = (app == "member") + var internalSearcher = (app == Constants.Applications.Members) ? UmbracoContext.Current.InternalMemberSearchProvider : UmbracoContext.Current.InternalSearchProvider; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs index b9d51f90c0..be85585f8e 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs @@ -7,6 +7,7 @@ using umbraco.BusinessLogic.Actions; using umbraco.cms.businesslogic.media; using umbraco.cms.businesslogic.property; using umbraco.interfaces; +using Umbraco.Core; namespace umbraco.cms.presentation.Trees { @@ -87,7 +88,7 @@ function openMedia(id) { } else { - if (dd.ContentType.Alias.ToLower() == "folder") + if (string.Equals(dd.ContentType.Alias, Constants.Conventions.MediaTypes.Folder, StringComparison.OrdinalIgnoreCase)) { xNode.Action = "javascript:jQuery('.umbTree #" + dd.Id.ToString() + "').click();"; } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/ContentRecycleBin.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/ContentRecycleBin.cs index b200ce5fe9..daec22bb7b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/ContentRecycleBin.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/ContentRecycleBin.cs @@ -22,6 +22,7 @@ using umbraco.cms.businesslogic.web; using umbraco.interfaces; using umbraco.DataLayer; using umbraco.BusinessLogic.Actions; +using Umbraco.Core; namespace umbraco.cms.presentation.Trees @@ -29,7 +30,7 @@ namespace umbraco.cms.presentation.Trees /// /// Handles loading the content tree into umbraco's application tree /// - [Tree("content", "contentRecycleBin", "Recycle Bin", "folder.gif", "folder_o.gif", initialize: false)] + [Tree(Constants.Applications.Content, "contentRecycleBin", "Recycle Bin", "folder.gif", "folder_o.gif", initialize: false)] public class ContentRecycleBin : BaseContentTree { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/MediaRecycleBin.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/MediaRecycleBin.cs index e9243745df..199e8a2018 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/MediaRecycleBin.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/MediaRecycleBin.cs @@ -25,11 +25,12 @@ using umbraco.DataLayer; using umbraco.BusinessLogic.Actions; using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; +using Umbraco.Core; namespace umbraco.cms.presentation.Trees { - [Tree("media", "mediaRecycleBin", "Recycle Bin", "folder.gif", "folder_o.gif", initialize : false)] + [Tree(Constants.Applications.Media, "mediaRecycleBin", "Recycle Bin", "folder.gif", "folder_o.gif", initialize : false)] public class MediaRecycleBin : BaseMediaTree { public MediaRecycleBin(string application) : base(application) { } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs index 051840a312..9a3e981ee6 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs @@ -13,10 +13,11 @@ using System.Xml; using System.Collections.Generic; using System.Text; using umbraco.BusinessLogic.Actions; +using Umbraco.Core; namespace umbraco.cms.presentation.Trees { - [Tree("users", "userPermissions", "User Permissions", sortOrder: 2)] + [Tree(Constants.Applications.Users, "userPermissions", "User Permissions", sortOrder: 2)] public class UserPermissions : BaseTree { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserTypes.cs index 9393f3ce39..573239b40f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserTypes.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserTypes.cs @@ -10,10 +10,11 @@ using System.Web.UI.HtmlControls; using umbraco.BusinessLogic; using System.Collections.Generic; using umbraco.businesslogic; +using Umbraco.Core; namespace umbraco.cms.presentation.Trees { - [Tree("users", "userTypes", "User Types", sortOrder: 1)] + [Tree(Constants.Applications.Users, "userTypes", "User Types", sortOrder: 1)] public class UserTypes : BaseTree { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadContent.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadContent.cs index f34a5365c8..753eea361e 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadContent.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadContent.cs @@ -4,13 +4,14 @@ using umbraco.businesslogic; using umbraco.cms.businesslogic.web; using umbraco.cms.presentation.Trees; using umbraco.interfaces; +using Umbraco.Core; namespace umbraco { /// /// Handles loading the content tree into umbraco's application tree /// - [Tree("content", "content", "Content", silent: true)] + [Tree(Constants.Applications.Content, "content", "Content", silent: true)] public class loadContent : BaseContentTree { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDataTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDataTypes.cs index f7991167b1..870b7d08cb 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDataTypes.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDataTypes.cs @@ -24,6 +24,7 @@ using umbraco.DataLayer; using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; using umbraco.BusinessLogic.Actions; +using Umbraco.Core; namespace umbraco @@ -31,7 +32,7 @@ namespace umbraco /// /// Handles loading of all datatypes into the developer application tree /// - [Tree("developer", "datatype", "Data Types", sortOrder: 1)] + [Tree(Constants.Applications.Developer, "datatype", "Data Types", sortOrder: 1)] public class loadDataTypes : BaseTree { public loadDataTypes(string application) : base(application) { } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs index 031f1c66cb..33f522ba44 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs @@ -24,11 +24,12 @@ using umbraco.DataLayer; using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; using umbraco.BusinessLogic.Actions; +using Umbraco.Core; namespace umbraco { - [Tree("settings", "dictionary", "Dictionary", action: "openDictionary()", sortOrder: 3)] + [Tree(Constants.Applications.Settings, "dictionary", "Dictionary", action: "openDictionary()", sortOrder: 3)] public class loadDictionary : BaseTree { public loadDictionary(string application) : base(application) { } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadLanguages.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadLanguages.cs index 0e2e06590c..bbbad92f5a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadLanguages.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadLanguages.cs @@ -24,11 +24,12 @@ using umbraco.DataLayer; using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; using umbraco.BusinessLogic.Actions; +using Umbraco.Core; namespace umbraco { - [Tree("settings", "languages", "Languages", sortOrder: 4)] + [Tree(Constants.Applications.Settings, "languages", "Languages", sortOrder: 4)] public class loadLanguages : BaseTree { public loadLanguages(string application) : base(application) { } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMacros.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMacros.cs index 3759c458e8..dc04615d80 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMacros.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMacros.cs @@ -24,6 +24,7 @@ using umbraco.DataLayer; using umbraco.BusinessLogic.Actions; using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; +using Umbraco.Core; namespace umbraco @@ -31,7 +32,7 @@ namespace umbraco /// /// Handles loading of the cache application into the developer application tree /// - [Tree("developer", "macros", "Macros", sortOrder: 2)] + [Tree(Constants.Applications.Developer, "macros", "Macros", sortOrder: 2)] public class loadMacros : BaseTree { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMedia.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMedia.cs index 4276a4b16d..90135d9d15 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMedia.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMedia.cs @@ -29,7 +29,7 @@ using Umbraco.Core; namespace umbraco { - [Tree("media", "media", "Media")] + [Tree(Constants.Applications.Media, "media", "Media")] public class loadMedia : BaseMediaTree { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMediaTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMediaTypes.cs index 572ec9f013..1f58cee995 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMediaTypes.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMediaTypes.cs @@ -7,10 +7,11 @@ using umbraco.BusinessLogic.Actions; using umbraco.businesslogic; using umbraco.cms.presentation.Trees; using umbraco.interfaces; +using Umbraco.Core; namespace umbraco { - [Tree("settings", "mediaTypes", "Media Types", sortOrder: 5)] + [Tree(Constants.Applications.Settings, "mediaTypes", "Media Types", sortOrder: 5)] public class loadMediaTypes : BaseTree { public loadMediaTypes(string application) : base(application) { } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs index faf3bd47f8..1b12404840 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs @@ -24,13 +24,14 @@ using umbraco.DataLayer; using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; using System.Web.Security; +using Umbraco.Core; namespace umbraco { /// /// Handles loading of the member groups into the application tree /// - [Tree("member", "memberGroup", "Member Groups", sortOrder: 1)] + [Tree(Constants.Applications.Members, "memberGroup", "Member Groups", sortOrder: 1)] public class loadMemberGroups : BaseTree { public loadMemberGroups(string application) : base(application) { } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberTypes.cs index 1a8f1c4e5d..9452b990e6 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberTypes.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberTypes.cs @@ -23,6 +23,7 @@ using umbraco.interfaces; using umbraco.DataLayer; using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; +using Umbraco.Core; namespace umbraco @@ -30,7 +31,7 @@ namespace umbraco /// /// Handles loading of the member types into the application tree /// - [Tree("member", "memberType", "Member Types", sortOrder: 2)] + [Tree(Constants.Applications.Members, "memberType", "Member Types", sortOrder: 2)] public class loadMemberTypes : BaseTree { public loadMemberTypes(string application) : base(application) { } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMembers.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMembers.cs index 36cd28bb23..26e0a59b40 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMembers.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMembers.cs @@ -23,6 +23,7 @@ using umbraco.interfaces; using umbraco.DataLayer; using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; +using Umbraco.Core; namespace umbraco @@ -30,7 +31,7 @@ namespace umbraco /// /// Handles loading of the member application into the application tree /// - [Tree("member", "member", "Members")] + [Tree(Constants.Applications.Members, "member", "Members")] public class loadMembers : BaseTree { public loadMembers(string application) : base(application) { } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs index 1d39f1c847..ae82b25b71 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs @@ -8,11 +8,12 @@ using umbraco.businesslogic; using umbraco.interfaces; using umbraco.BusinessLogic.Actions; using umbraco.cms.presentation.Trees; +using Umbraco.Core; namespace umbraco { - [Tree("settings", "nodeTypes", "Document Types", sortOrder: 6)] + [Tree(Constants.Applications.Settings, "nodeTypes", "Document Types", sortOrder: 6)] public class loadNodeTypes : BaseTree { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs index 17d7bc658c..a45cd08d23 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs @@ -22,13 +22,14 @@ using umbraco.cms.businesslogic.web; using umbraco.interfaces; using umbraco.DataLayer; using umbraco.BusinessLogic.Utils; +using Umbraco.Core; namespace umbraco { /// /// Handles loading of the packager application into the developer application tree /// - [Tree("developer", "packager", "Packages", sortOrder: 3)] + [Tree(Constants.Applications.Developer, "packager", "Packages", sortOrder: 3)] public class loadPackager : ITree { #region TreeI Members diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs index 8b7d85eea9..7d19a48e8b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs @@ -23,10 +23,11 @@ using umbraco.interfaces; using umbraco.DataLayer; using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; +using Umbraco.Core; namespace umbraco { - [Tree("developer", "packagerPackages", "Packager Packages", initialize: false, sortOrder: 1)] + [Tree(Constants.Applications.Developer, "packagerPackages", "Packager Packages", initialize: false, sortOrder: 1)] public class loadPackages : BaseTree { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs index 75c2f6fa93..a91a748bf9 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs @@ -24,6 +24,7 @@ using umbraco.DataLayer; using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; using umbraco.IO; +using Umbraco.Core; namespace umbraco @@ -31,7 +32,7 @@ namespace umbraco /// /// Handles loading of python items into the developer application tree /// - [Tree("developer", "python", "Python Files", sortOrder: 4)] + [Tree(Constants.Applications.Developer, "python", "Python Files", sortOrder: 4)] public class loadPython : loadDLRScripts { public loadPython(string application) : base(application) { } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs index 4e19a87947..9f558e65ba 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs @@ -10,13 +10,14 @@ using umbraco.DataLayer; using umbraco.interfaces; using umbraco.cms.presentation.developer.RelationTypes.TreeMenu; using umbraco.businesslogic; +using Umbraco.Core; namespace umbraco { /// /// RelationTypes tree for developer section /// - [Tree("developer", "relationTypes", "Relation Types", sortOrder: 4)] + [Tree(Constants.Applications.Developer, "relationTypes", "Relation Types", sortOrder: 4)] public class loadRelationTypes : BaseTree { /// diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs index 7d368bc634..bea5e7d7a2 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs @@ -25,11 +25,12 @@ using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; using umbraco.BusinessLogic.Actions; using umbraco.IO; +using Umbraco.Core; namespace umbraco { - [Tree("settings", "scripts", "Scripts", "folder.gif", "folder_o.gif", sortOrder: 2)] + [Tree(Constants.Applications.Settings, "scripts", "Scripts", "folder.gif", "folder_o.gif", sortOrder: 2)] public class loadScripts : FileSystemTree { public loadScripts(string application) : base(application) { } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheetProperty.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheetProperty.cs index fbf73180d8..31c5c804c5 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheetProperty.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheetProperty.cs @@ -23,11 +23,12 @@ using umbraco.interfaces; using umbraco.DataLayer; using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; +using Umbraco.Core; namespace umbraco { - [Tree("settings", "stylesheetProperty", "Stylesheet Property", "", "", initialize: false)] + [Tree(Constants.Applications.Settings, "stylesheetProperty", "Stylesheet Property", "", "", initialize: false)] public class loadStylesheetProperty : BaseTree { public loadStylesheetProperty(string application) : base(application) { } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs index d5d1b03b95..95001fafb5 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs @@ -24,11 +24,12 @@ using umbraco.DataLayer; using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; using umbraco.BusinessLogic.Actions; +using Umbraco.Core; namespace umbraco { - [Tree("settings", "stylesheets", "Stylesheets")] + [Tree(Constants.Applications.Settings, "stylesheets", "Stylesheets")] public class loadStylesheets : BaseTree { public loadStylesheets(string application) : base(application) { } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs index ac18b1775f..ad1feb1c69 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs @@ -30,7 +30,7 @@ using umbraco.cms.businesslogic.skinning; namespace umbraco { - [Tree("settings", "templates", "Templates", sortOrder: 1)] + [Tree(Constants.Applications.Settings, "templates", "Templates", sortOrder: 1)] public class loadTemplates : BaseTree { public loadTemplates(string application) : base(application) {} diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadUsers.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadUsers.cs index 16c36baec3..198af77cec 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadUsers.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadUsers.cs @@ -25,6 +25,7 @@ using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; using umbraco.BusinessLogic.Actions; using System.Linq; +using Umbraco.Core; namespace umbraco @@ -32,7 +33,7 @@ namespace umbraco /// /// Handles loading of all umbraco users into the users application tree /// - [Tree("users", "users", "Users")] + [Tree(Constants.Applications.Users, "users", "Users")] public class loadUsers : BaseTree { public loadUsers(string application) : base(application) { } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs index 696ac7f84a..b2a71a7ace 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs @@ -25,13 +25,14 @@ using umbraco.cms.presentation.Trees; using umbraco.BusinessLogic.Utils; using umbraco.BusinessLogic.Actions; using umbraco.IO; +using Umbraco.Core; namespace umbraco { /// /// Handles loading of the xslt files into the application tree /// - [Tree("developer", "xslt", "XSLT Files", sortOrder: 5)] + [Tree(Constants.Applications.Developer, "xslt", "XSLT Files", sortOrder: 5)] public class loadXslt : FileSystemTree { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx.cs index 415ebb5236..ab7f2f2c4b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx.cs @@ -9,6 +9,7 @@ using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; using umbraco.cms.businesslogic.web; +using Umbraco.Core; namespace umbraco.presentation.actions { @@ -20,7 +21,7 @@ namespace umbraco.presentation.actions { d = new Document(int.Parse(helper.Request("id"))); - if (!base.ValidateUserApp("content")) + if (!base.ValidateUserApp(Constants.Applications.Content)) throw new ArgumentException("The current user doesn't have access to this application. Please contact the system administrator."); if (!base.ValidateUserNodeTreePermissions(d.Path, "D")) throw new ArgumentException("The current user doesn't have permissions to delete this document. Please contact the system administrator."); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs index 303ccfbb03..9b964cb166 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs @@ -9,6 +9,7 @@ using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; using umbraco.cms.businesslogic.web; +using Umbraco.Core; namespace umbraco.presentation.actions { @@ -20,7 +21,7 @@ namespace umbraco.presentation.actions { d = new Document(int.Parse(helper.Request("id"))); - if (!base.ValidateUserApp("content")) + if (!base.ValidateUserApp(Constants.Applications.Content)) throw new ArgumentException("The current user doesn't have access to this application. Please contact the system administrator."); if (!base.ValidateUserNodeTreePermissions(d.Path, "U")) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentPicker.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentPicker.cs index a8d032f5db..0e1596b9d5 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentPicker.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentPicker.cs @@ -10,6 +10,7 @@ using System.Web.UI.HtmlControls; using umbraco.cms.presentation.Trees; using umbraco.presentation; using umbraco.uicontrols.TreePicker; +using Umbraco.Core; namespace umbraco.controls { @@ -19,7 +20,7 @@ namespace umbraco.controls public ContentPicker() { - AppAlias = "content"; + AppAlias = Constants.Applications.Content; TreeAlias = "content"; } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/UploadMediaImage.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/UploadMediaImage.ascx.cs index 1f19ab5390..7e58989c40 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/UploadMediaImage.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/UploadMediaImage.ascx.cs @@ -60,7 +60,7 @@ namespace umbraco.controls.Images protected void SubmitButton_Click(object sender, EventArgs e) { - var media = Media.MakeNew(TextBoxTitle.Text, cms.businesslogic.media.MediaType.GetByAlias("image"), BasePage.Current.getUser(), int.Parse(MediaPickerControl.Value)); + var media = Media.MakeNew(TextBoxTitle.Text, cms.businesslogic.media.MediaType.GetByAlias(Constants.Conventions.MediaTypes.Image), BasePage.Current.getUser(), int.Parse(MediaPickerControl.Value)); foreach (var property in media.GenericProperties) { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs index 71ff831841..fd1b180005 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs @@ -16,6 +16,7 @@ using System.Web.Services; using System.Drawing; using umbraco.BusinessLogic; using System.Linq; +using Umbraco.Core; namespace umbraco.controls.Tree { @@ -53,7 +54,7 @@ namespace umbraco.controls.Tree /// /// If there is not application or tree specified in a query string then this is the application to load. /// - private const string DEFAULT_APP = "content"; + private const string DEFAULT_APP = Constants.Applications.Content; private List m_ActiveTrees = new List(); private List m_AllAppTrees = new List(); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs index 58d5d391a2..ca384bd3af 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs @@ -15,6 +15,7 @@ using umbraco.presentation; using umbraco.BusinessLogic.Actions; using umbraco.BasePages; using umbraco.cms.businesslogic.web; +using Umbraco.Core; namespace umbraco.dialogs { @@ -40,7 +41,7 @@ namespace umbraco.dialogs { int nodeId = int.Parse(helper.Request("nodeId")); //ensure they have access to create under this node!! - if (helper.Request("app") == "media" || CheckCreatePermissions(nodeId)) + if (helper.Request("app") == Constants.Applications.Media || CheckCreatePermissions(nodeId)) { //pane_chooseName.Text = ui.Text("create", "updateData", this.getUser()); cms.businesslogic.CMSNode c = new cms.businesslogic.CMSNode(nodeId); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs index d8d313419b..3d0348e26f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs @@ -13,6 +13,7 @@ using umbraco.cms.businesslogic; using umbraco.cms.presentation.user; using umbraco.interfaces; using Umbraco.Web; +using Umbraco.Core; namespace umbraco.dialogs { @@ -34,7 +35,7 @@ namespace umbraco.dialogs //Document Type copy Hack... var app = Request.GetItemAsString("app"); - if (app == "settings") + if (app == Constants.Applications.Settings) { pane_form.Visible = false; pane_form_notice.Visible = false; @@ -72,7 +73,7 @@ namespace umbraco.dialogs var cmsNode = new CMSNode(int.Parse(Request.GetItemAsString("id"))); var validAction = true; - if (app == "content" && cmsNode.HasChildren) + if (app == Constants.Applications.Content && cmsNode.HasChildren) validAction = ValidAction(Request.GetItemAsString("mode") == "cut" ? 'M' : 'O'); @@ -177,7 +178,7 @@ namespace umbraco.dialogs public void HandleMoveOrCopy(object sender, EventArgs e) { - if (Request["app"] == "settings") + if (Request["app"] == Constants.Applications.Settings) HandleDocumentTypeCopy(); else HandleDocumentMoveOrCopy(); @@ -243,7 +244,7 @@ namespace umbraco.dialogs if (Request["mode"] == "cut") { - if (Request["app"] == "content") + if (Request["app"] == Constants.Applications.Content) { //PPH changed this to document instead of cmsNode to handle republishing. var documentId = int.Parse(Request.GetItemAsString("id")); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs index 5e9df5ed2e..acc3604bd0 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs @@ -8,6 +8,7 @@ using System.Xml; using Examine; using Examine.LuceneEngine.SearchCriteria; using System.Linq; +using Umbraco.Core; namespace umbraco.presentation.dialogs @@ -52,7 +53,7 @@ namespace umbraco.presentation.dialogs } //if it doesn't start with "*", then search only nodeName and nodeId - var internalSearcher = (app == "member") + var internalSearcher = (app == Constants.Applications.Members) ? UmbracoContext.Current.InternalMemberSearchProvider : UmbracoContext.Current.InternalSearchProvider; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sort.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sort.aspx.cs index 12b1dfd708..825e85e030 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sort.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sort.aspx.cs @@ -41,7 +41,7 @@ namespace umbraco.cms.presentation int parentId; if (int.TryParse(Request.GetItemAsString("ID"), out parentId)) { - if (app == "media") + if (app == Constants.Applications.Media) { icon = "../images/umbraco/mediaPhoto.gif"; var mediaService = ApplicationContext.Current.Services.MediaService; @@ -59,7 +59,7 @@ namespace umbraco.cms.presentation } } - if (app == "content") + if (app == Constants.Applications.Content) { var contentService = ApplicationContext.Current.Services.ContentService; @@ -78,7 +78,7 @@ namespace umbraco.cms.presentation // "hack for stylesheet" // TODO: I can't see where this is being used at all..? - if (app == "settings") + if (app == Constants.Applications.Settings) { icon = "../images/umbraco/settingCss.gif"; var ss = new StyleSheet(parentId); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs index 2020f56f03..1bef8254df 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs @@ -502,7 +502,7 @@ namespace umbraco.cms.presentation private bool CheckUserValidation() { // Validate permissions - if (!base.ValidateUserApp("content")) + if (!base.ValidateUserApp(Constants.Applications.Content)) { ShowUserValidationError("

The current user doesn't have access to this application

Please contact the system administrator if you think that you should have access.

"); return false; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs index d4e5a1531a..e1847f22a4 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs @@ -16,6 +16,7 @@ using umbraco.businesslogic.Exceptions; using umbraco.IO; using umbraco.cms.businesslogic.web; using System.Linq; +using Umbraco.Core; namespace umbraco.cms.presentation { @@ -168,7 +169,7 @@ namespace umbraco.cms.presentation { BusinessLogic.User.MakeNew(loginName, loginName, string.Empty, email, BusinessLogic.UserType.GetUserType(2)); BusinessLogic.User u = new BusinessLogic.User(loginName); - u.addApplication("content"); + u.addApplication(Constants.Applications.Content); } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx.cs index 255c310b98..ba471014e5 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using Umbraco.Core; namespace umbraco.presentation.plugins.tinymce3 { @@ -23,7 +24,7 @@ namespace umbraco.presentation.plugins.tinymce3 tp.Controls.Add(pane_content); - if (CurrentUser.GetApplications().Find(t => t.alias == "media") != null) + if (CurrentUser.GetApplications().Find(t => t.alias == Constants.Applications.Media) != null) { uicontrols.TabPage tp2 = tv_options.NewTabPage(ui.Text("media")); tp2.HasMenu = false; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs index 3213099c25..a37830852e 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs @@ -191,7 +191,7 @@ namespace umbraco /// public static string GetImageUrl(this Media media) { - if (media.ContentType.Alias.Equals("Image")) + if (media.ContentType.Alias.Equals(Constants.Conventions.MediaTypes.Image)) { var url = media.GetProperty(Constants.Conventions.Media.File); if (!string.IsNullOrEmpty(url)) @@ -210,7 +210,7 @@ namespace umbraco /// public static string GetImageThumbnailUrl(this Media media) { - if (media.ContentType.Alias.Equals("Image")) + if (media.ContentType.Alias.Equals(Constants.Conventions.MediaTypes.Image)) { var url = media.GetProperty(Constants.Conventions.Media.File); if (!string.IsNullOrEmpty(url)) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-UmbracoObjectType.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-UmbracoObjectType.cs index f9a4a4a969..f6774223ab 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-UmbracoObjectType.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-UmbracoObjectType.cs @@ -88,7 +88,7 @@ namespace umbraco /// /// Recycle Bin /// - [Guid(Constants.ObjectTypes.RecycleBin)] + [Guid(Constants.ObjectTypes.ContentRecycleBin)] [FriendlyName("Recycle Bin")] RecycleBin, diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs index 8fd2a6428f..7604ae23f9 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs @@ -36,7 +36,7 @@ namespace umbraco.cms.presentation protected void Page_Load(object sender, System.EventArgs e) { var apps = this.getUser().Applications.ToList(); - bool userHasAccesstodefaultApp = apps.Where(x => x.alias == "content").Count() > 0; + bool userHasAccesstodefaultApp = apps.Where(x => x.alias == Umbraco.Core.Constants.Applications.Content).Count() > 0; // Load user module icons .. if (apps.Count() > 1) @@ -82,7 +82,7 @@ namespace umbraco.cms.presentation } else { - DefaultApp = "content"; + DefaultApp = Umbraco.Core.Constants.Applications.Content; } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs index 1d79e5b1d4..55303bc219 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs @@ -117,7 +117,7 @@ namespace umbraco.cms.presentation.user DefaultToLiveEditing.Checked = u.DefaultToLiveEditing; PlaceHolder medias = new PlaceHolder(); - mediaPicker.AppAlias = "media"; + mediaPicker.AppAlias = Constants.Applications.Media; mediaPicker.TreeAlias = "media"; if (u.StartMediaId > 0) @@ -128,7 +128,7 @@ namespace umbraco.cms.presentation.user medias.Controls.Add(mediaPicker); PlaceHolder content = new PlaceHolder(); - contentPicker.AppAlias = "content"; + contentPicker.AppAlias = Constants.Applications.Content; contentPicker.TreeAlias = "content"; if (u.StartNodeId > 0) @@ -246,7 +246,7 @@ namespace umbraco.cms.presentation.user // Handle content and media pickers PlaceHolder medias = new PlaceHolder(); - cMediaPicker.AppAlias = "media"; + cMediaPicker.AppAlias = Constants.Applications.Media; cMediaPicker.TreeAlias = "media"; if (userChannel.MediaFolder > 0) @@ -257,7 +257,7 @@ namespace umbraco.cms.presentation.user medias.Controls.Add(cMediaPicker); PlaceHolder content = new PlaceHolder(); - cContentPicker.AppAlias = "content"; + cContentPicker.AppAlias = Constants.Applications.Content; cContentPicker.TreeAlias = "content"; if (userChannel.StartNode > 0) @@ -494,7 +494,7 @@ namespace umbraco.cms.presentation.user c.DocumentTypeAlias = cDocumentType.SelectedValue; // - c.MediaTypeAlias = "image"; + c.MediaTypeAlias = Constants.Conventions.MediaTypes.Image; // [LK:2013-03-22] This was previously lowercase; unsure if using const will cause an issue. c.MediaTypeFileProperty = Constants.Conventions.Media.File; c.ImageSupport = true; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs index afb12c3c10..bc681ddf2b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs @@ -14,6 +14,7 @@ using umbraco.BasePages; using umbraco.BusinessLogic; using umbraco.businesslogic.Exceptions; using umbraco.cms.businesslogic.media; +using Umbraco.Core; namespace umbraco.presentation.umbraco.webservices { @@ -222,7 +223,7 @@ namespace umbraco.presentation.umbraco.webservices if (mp != null && mp.ValidateUser(username, password)) { var user = new User(username); - isValid = user.Applications.Any(app => app.alias == "media"); + isValid = user.Applications.Any(app => app.alias == Constants.Applications.Media); if (isValid) AuthenticatedUser = user; @@ -234,7 +235,7 @@ namespace umbraco.presentation.umbraco.webservices var user = new User(username); if (t != null) - isValid = user.LoginName.ToLower() == t.Name.ToLower() && user.Applications.Any(app => app.alias == "media"); + isValid = user.LoginName.ToLower() == t.Name.ToLower() && user.Applications.Any(app => app.alias == Constants.Applications.Media); if (isValid) AuthenticatedUser = user; @@ -250,7 +251,7 @@ namespace umbraco.presentation.umbraco.webservices private void CreateMediaTree(IEnumerable nodes, FolderListItem folder) { - foreach (var media in nodes.Where(media => media != null && media.ContentType != null && media.ContentType.Alias == "Folder")) + foreach (var media in nodes.Where(media => media != null && media.ContentType != null && media.ContentType.Alias == Constants.Conventions.MediaTypes.Folder)) { var subFolder = new FolderListItem { @@ -303,7 +304,7 @@ namespace umbraco.presentation.umbraco.webservices } } - var media = Media.MakeNew(name, MediaType.GetByAlias("Folder"), User.GetUser(0), parent.Id); + var media = Media.MakeNew(name, MediaType.GetByAlias(Constants.Conventions.MediaTypes.Folder), User.GetUser(0), parent.Id); media.sortOrder = 0; media.Save(); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs index e767cf5fd9..146553b637 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs @@ -11,6 +11,7 @@ using Umbraco.Web.Security; using umbraco.BasePages; using umbraco.BusinessLogic.Actions; using umbraco.cms.businesslogic.web; +using Umbraco.Core; namespace umbraco.presentation.webservices { @@ -36,7 +37,7 @@ namespace umbraco.presentation.webservices // Root nodes? if (ParentId == -1) { - if (App == "media") + if (App == Constants.Applications.Media) { foreach (cms.businesslogic.media.Media child in cms.businesslogic.media.Media.GetRootMedias()) nodes.Add(new SortNode(child.Id, child.sortOrder, child.Text, child.CreateDateTime)); @@ -48,7 +49,7 @@ namespace umbraco.presentation.webservices else { // "hack for stylesheet" - if (App == "settings") + if (App == Constants.Applications.Settings) { var styleSheet = new StyleSheet(cmsNode.Id); foreach (var child in styleSheet.Properties) @@ -83,8 +84,8 @@ namespace umbraco.presentation.webservices { var tmp = SortOrder.Split(','); - var isContent = Context.Request.GetItemAsString("app") == "content" | helper.Request("app") == ""; - var isMedia = Context.Request.GetItemAsString("app") == "media"; + var isContent = Context.Request.GetItemAsString("app") == Constants.Applications.Content | helper.Request("app") == ""; + var isMedia = Context.Request.GetItemAsString("app") == Constants.Applications.Media; for (var i = 0; i < tmp.Length; i++) { @@ -136,7 +137,7 @@ namespace umbraco.presentation.webservices } // fire actionhandler, check for content - if ((helper.Request("app") == "content" | helper.Request("app") == "") && ParentId > 0) + if ((helper.Request("app") == Constants.Applications.Content | helper.Request("app") == "") && ParentId > 0) global::umbraco.BusinessLogic.Actions.Action.RunActionHandlers(new Document(ParentId), ActionSort.Instance); } } diff --git a/src/umbraco.businesslogic/ApplicationDefinitions.cs b/src/umbraco.businesslogic/ApplicationDefinitions.cs index d26488773c..c2e8e9178b 100644 --- a/src/umbraco.businesslogic/ApplicationDefinitions.cs +++ b/src/umbraco.businesslogic/ApplicationDefinitions.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using umbraco.interfaces; +using Umbraco.Core; namespace umbraco.businesslogic { @@ -10,31 +11,31 @@ namespace umbraco.businesslogic // the application.config. On app startup, Umbraco will look for any // unregistered classes with an ApplicationAttribute and add them to the cache - [Application("content", "Content", ".traycontent")] + [Application(Constants.Applications.Content, "Content", ".traycontent")] public class ContentApplicationDefinition : IApplication { } - [Application("media", "Media", ".traymedia", sortOrder: 1)] + [Application(Constants.Applications.Media, "Media", ".traymedia", sortOrder: 1)] public class MediaApplicationDefinition : IApplication { } - [Application("settings", "Settings", ".traysettings", sortOrder: 2)] + [Application(Constants.Applications.Settings, "Settings", ".traysettings", sortOrder: 2)] public class SettingsApplicationDefinition : IApplication { } - [Application("developer", "Developer", ".traydeveloper", sortOrder: 3)] + [Application(Constants.Applications.Developer, "Developer", ".traydeveloper", sortOrder: 3)] public class DeveloperApplicationDefinition : IApplication { } - [Application("users", "Users", ".trayusers", sortOrder: 4)] + [Application(Constants.Applications.Users, "Users", ".trayusers", sortOrder: 4)] public class UsersApplicationDefinition : IApplication { } - [Application("member", "Members", ".traymember", sortOrder: 5)] + [Application(Constants.Applications.Members, "Members", ".traymember", sortOrder: 5)] public class MembersApplicationDefinition : IApplication { } - [Application("translation", "Translation", ".traytranslation", sortOrder: 6)] + [Application(Constants.Applications.Translation, "Translation", ".traytranslation", sortOrder: 6)] public class TranslationApplicationDefinition : IApplication { } } diff --git a/src/umbraco.cms/businesslogic/RecycleBin.cs b/src/umbraco.cms/businesslogic/RecycleBin.cs index 84e4319aa3..3f4ad28b94 100644 --- a/src/umbraco.cms/businesslogic/RecycleBin.cs +++ b/src/umbraco.cms/businesslogic/RecycleBin.cs @@ -18,8 +18,8 @@ namespace umbraco.cms.businesslogic /// public enum RecycleBinType { - Content = -20, - Media = -21 + Content = Constants.System.RecycleBinContent, + Media = Constants.System.RecycleBinMedia } private const string m_ChildCountSQL = @"select count(id) from umbracoNode where nodeObjectType = @nodeObjectType and path like '%,{0},%'"; diff --git a/src/umbraco.cms/businesslogic/media/UmbracoFileMediaFactory.cs b/src/umbraco.cms/businesslogic/media/UmbracoFileMediaFactory.cs index ef7942a5aa..26a3fdfe83 100644 --- a/src/umbraco.cms/businesslogic/media/UmbracoFileMediaFactory.cs +++ b/src/umbraco.cms/businesslogic/media/UmbracoFileMediaFactory.cs @@ -14,7 +14,7 @@ namespace umbraco.cms.businesslogic.media { public override string MediaTypeAlias { - get { return "File"; } + get { return Constants.Conventions.MediaTypes.File; } } public override List Extensions diff --git a/src/umbraco.cms/businesslogic/media/UmbracoImageMediaFactory.cs b/src/umbraco.cms/businesslogic/media/UmbracoImageMediaFactory.cs index e1dbfb6f11..c415516102 100644 --- a/src/umbraco.cms/businesslogic/media/UmbracoImageMediaFactory.cs +++ b/src/umbraco.cms/businesslogic/media/UmbracoImageMediaFactory.cs @@ -9,7 +9,7 @@ namespace umbraco.cms.businesslogic.media { public override string MediaTypeAlias { - get { return "Image"; } + get { return Constants.Conventions.MediaTypes.Image; } } public override List Extensions diff --git a/src/umbraco.cms/businesslogic/media/UmbracoMediaFactory.cs b/src/umbraco.cms/businesslogic/media/UmbracoMediaFactory.cs index 0fa1caa041..6f6d395b31 100644 --- a/src/umbraco.cms/businesslogic/media/UmbracoMediaFactory.cs +++ b/src/umbraco.cms/businesslogic/media/UmbracoMediaFactory.cs @@ -30,7 +30,7 @@ namespace umbraco.cms.businesslogic.media { var parentNode = new Media(parentNodeId); - return parentNodeId <= -1 || user.Applications.Any(app => app.alias.ToLower() == "media") && (user.StartMediaId <= 0 || ("," + parentNode.Path + ",").Contains("," + user.StartMediaId + ",")) && parentNode.ContentType.AllowedChildContentTypeIDs.Contains(MediaType.GetByAlias(MediaTypeAlias).Id); + return parentNodeId <= -1 || user.Applications.Any(app => app.alias.ToLower() == Constants.Applications.Media) && (user.StartMediaId <= 0 || ("," + parentNode.Path + ",").Contains("," + user.StartMediaId + ",")) && parentNode.ContentType.AllowedChildContentTypeIDs.Contains(MediaType.GetByAlias(MediaTypeAlias).Id); } catch { diff --git a/src/umbraco.cms/helpers/DeepLink.cs b/src/umbraco.cms/helpers/DeepLink.cs index 1ab9c50820..595647c612 100644 --- a/src/umbraco.cms/helpers/DeepLink.cs +++ b/src/umbraco.cms/helpers/DeepLink.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using umbraco.BusinessLogic; using System.Web; +using Umbraco.Core; namespace umbraco.cms.helpers { @@ -50,57 +51,57 @@ namespace umbraco.cms.helpers switch (type) { case DeepLinkType.Content: - section = "content"; + section = Constants.Applications.Content; editorUrl = "editContent.aspx"; idKey = "id"; break; case DeepLinkType.Css: - section = "settings"; + section = Constants.Applications.Settings; editorUrl = "settings/stylesheet/editStylesheet.aspx"; idKey = "id"; break; case DeepLinkType.DataType: - section = "developer"; + section = Constants.Applications.Developer; editorUrl = "developer/datatypes/editDataType.aspx"; idKey = "id"; break; case DeepLinkType.DocumentType: - section = "settings"; + section = Constants.Applications.Settings; editorUrl = "settings/editNodeTypeNew.aspx"; idKey = "id"; break; case DeepLinkType.Javascript: - section = "settings"; + section = Constants.Applications.Settings; editorUrl = "settings/scripts/editScript.aspx"; idKey = "file"; break; case DeepLinkType.Macro: - section = "developer"; + section = Constants.Applications.Developer; editorUrl = "developer/macros/editMacro.aspx"; idKey = "macroID"; break; case DeepLinkType.Media: - section = "media"; + section = Constants.Applications.Media; editorUrl = "editMedia.aspx"; idKey = "id"; break; case DeepLinkType.MediaType: - section = "settings"; + section = Constants.Applications.Settings; editorUrl = "settings/editMediaType.aspx"; idKey = "id"; break; case DeepLinkType.RazorScript: - section = "developer"; + section = Constants.Applications.Developer; editorUrl = "developer/python/editPython.aspx"; idKey = "file"; break; case DeepLinkType.Template: - section = "settings"; + section = Constants.Applications.Settings; editorUrl = "settings/editTemplate.aspx"; idKey = "templateId"; break; case DeepLinkType.XSLT: - section = "developer"; + section = Constants.Applications.Developer; editorUrl = "developer/xslt/editXslt.aspx"; idKey = "file"; break; diff --git a/src/umbraco.controls/TreePicker/SimpleContentPicker.cs b/src/umbraco.controls/TreePicker/SimpleContentPicker.cs index 9866048294..de93637134 100644 --- a/src/umbraco.controls/TreePicker/SimpleContentPicker.cs +++ b/src/umbraco.controls/TreePicker/SimpleContentPicker.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using Umbraco.Core; namespace umbraco.uicontrols.TreePicker { @@ -11,7 +12,7 @@ namespace umbraco.uicontrols.TreePicker { get { - return TreeUrlGenerator.GetPickerUrl("content", "content"); + return TreeUrlGenerator.GetPickerUrl(Constants.Applications.Content, "content"); } } diff --git a/src/umbraco.controls/TreePicker/SimpleMediaPicker.cs b/src/umbraco.controls/TreePicker/SimpleMediaPicker.cs index d91ca6cbba..c7c7125f1e 100644 --- a/src/umbraco.controls/TreePicker/SimpleMediaPicker.cs +++ b/src/umbraco.controls/TreePicker/SimpleMediaPicker.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using Umbraco.Core; namespace umbraco.uicontrols.TreePicker { @@ -11,7 +12,7 @@ namespace umbraco.uicontrols.TreePicker { get { - return TreeUrlGenerator.GetPickerUrl("media", "media"); + return TreeUrlGenerator.GetPickerUrl(Constants.Applications.Media, "media"); } } diff --git a/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_DataEditor.cs b/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_DataEditor.cs index 0f884d951f..72d36c8fa2 100644 --- a/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_DataEditor.cs +++ b/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_DataEditor.cs @@ -44,7 +44,7 @@ namespace umbraco.editorControls.MultiNodeTreePicker //need to add our tree definitions to the collection. //find the content tree to duplicate - var contentTree = TreeDefinitionCollection.Instance.Single(x => x.Tree.Alias.ToUpper() == "CONTENT"); + var contentTree = TreeDefinitionCollection.Instance.Single(x => string.Equals(x.Tree.Alias, Umbraco.Core.Constants.Applications.Content, StringComparison.OrdinalIgnoreCase)); var filteredContentTree = new TreeDefinition(typeof(FilteredContentTree), new umbraco.BusinessLogic.ApplicationTree(true, false, 0, contentTree.Tree.ApplicationAlias, @@ -58,7 +58,7 @@ namespace umbraco.editorControls.MultiNodeTreePicker contentTree.App); //find the media tree to duplicate - var mediaTree = TreeDefinitionCollection.Instance.Single(x => x.Tree.Alias.ToUpper() == "MEDIA"); + var mediaTree = TreeDefinitionCollection.Instance.Single(x => string.Equals(x.Tree.Alias, Umbraco.Core.Constants.Applications.Media, StringComparison.OrdinalIgnoreCase)); var filteredMediaTree = new TreeDefinition(typeof(FilteredMediaTree), new umbraco.BusinessLogic.ApplicationTree(true, false, 0, mediaTree.Tree.ApplicationAlias, @@ -83,9 +83,9 @@ namespace umbraco.editorControls.MultiNodeTreePicker /// public MNTP_DataEditor() { - this.MediaTypesWithThumbnails = new string[] { "image" }; + this.MediaTypesWithThumbnails = new string[] { Umbraco.Core.Constants.Conventions.MediaTypes.Image }; ShowThumbnailsForMedia = true; - TreeToRender = "content"; + TreeToRender = Umbraco.Core.Constants.Applications.Content; MaxNodeCount = -1; MinNodeCount = 0; StartNodeId = uQuery.RootNodeId; @@ -295,14 +295,14 @@ namespace umbraco.editorControls.MultiNodeTreePicker //update the tree type (we need to do this each time because i don't think view state works with these controls) switch (TreeToRender) { - case "media": + case Umbraco.Core.Constants.Applications.Media: TreePickerControl.TreeType = "FilteredMediaTree"; - TreePickerControl.App = "media"; + TreePickerControl.App = Umbraco.Core.Constants.Applications.Media; break; - case "content": + case Umbraco.Core.Constants.Applications.Content: default: TreePickerControl.TreeType = "FilteredContentTree"; - TreePickerControl.App = "content"; + TreePickerControl.App = Umbraco.Core.Constants.Applications.Content; break; } @@ -450,8 +450,8 @@ namespace umbraco.editorControls.MultiNodeTreePicker lnkSelectNode.Attributes["class"] += " noSpr"; } - //show the media preview if media and allowed - if (TreeToRender == "media" && ShowThumbnailsForMedia) + //show the media preview if media and allowed + if (TreeToRender == Umbraco.Core.Constants.Applications.Media && ShowThumbnailsForMedia) { var imgPreview = (ImageViewer)e.Item.FindControl("ImgPreview"); //show the thubmnail controls @@ -466,7 +466,7 @@ namespace umbraco.editorControls.MultiNodeTreePicker //var inner = (HtmlGenericControl)e.Item.FindControl("InnerItem"); //inner.Style.Add(HtmlTextWriterStyle.Width, "224px"); - //check if it's a thumbnail type element, we need to check both schemas + //check if it's a thumbnail type element, we need to check both schemas if (MediaTypesWithThumbnails.Select(x => x.ToUpper()) .Contains(loadedNode.ContentType.Alias.ToUpper())) { @@ -561,7 +561,7 @@ namespace umbraco.editorControls.MultiNodeTreePicker MaxNodeCount, tooltipAjaxUrl, ShowToolTips.ToString().ToLower(), - (TreeToRender == "media" && ShowThumbnailsForMedia).ToString().ToLower(), + (TreeToRender == Umbraco.Core.Constants.Applications.Media && ShowThumbnailsForMedia).ToString().ToLower(), IOHelper.ResolveUrl(SystemDirectories.Umbraco), TreeToRender); var js = "jQuery(window).load(function() { " + jsMethod + " });"; diff --git a/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_PrevalueEditor.cs b/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_PrevalueEditor.cs index a44678175b..352288d301 100644 --- a/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_PrevalueEditor.cs +++ b/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_PrevalueEditor.cs @@ -6,6 +6,7 @@ using System.Web.UI.WebControls; using umbraco.cms.businesslogic.datatype; using umbraco.interfaces; using umbraco.uicontrols.TreePicker; +using Umbraco.Core; namespace umbraco.editorControls.MultiNodeTreePicker { @@ -27,7 +28,7 @@ namespace umbraco.editorControls.MultiNodeTreePicker { get { - return GetPreValue(PropertyIndex.TreeType, x => x.Value, "content"); + return GetPreValue(PropertyIndex.TreeType, x => x.Value, Constants.Applications.Content); } } @@ -346,10 +347,10 @@ namespace umbraco.editorControls.MultiNodeTreePicker switch (SelectedTreeType.ToLower()) { - case "content": + case Constants.Applications.Content: StartContentNodeIdPicker.Value = StartNodeId.ToString(); break; - case "media": + case Constants.Applications.Media: default: StartMediaNodeIdPicker.Value = StartNodeId.ToString(); break; @@ -371,8 +372,8 @@ namespace umbraco.editorControls.MultiNodeTreePicker TreeTypeDropDown = new DropDownList { ID = "TreeTypeList" }; - TreeTypeDropDown.Items.Add(new ListItem("Content", "content")); - TreeTypeDropDown.Items.Add(new ListItem("Media", "media")); + TreeTypeDropDown.Items.Add(new ListItem("Content", Constants.Applications.Content)); + TreeTypeDropDown.Items.Add(new ListItem("Media", Constants.Applications.Media)); TreeTypeDropDown.AutoPostBack = true; AddPreValueRow(MNTPResources.Lbl_SelectTreeType, "", TreeTypeDropDown); diff --git a/src/umbraco.editorControls/SettingControls/Pickers/Media.cs b/src/umbraco.editorControls/SettingControls/Pickers/Media.cs index 9e470c6850..2437eaf8aa 100644 --- a/src/umbraco.editorControls/SettingControls/Pickers/Media.cs +++ b/src/umbraco.editorControls/SettingControls/Pickers/Media.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; using umbraco.cms.businesslogic.datatype; +using Umbraco.Core; namespace umbraco.editorControls.SettingControls.Pickers { @@ -32,7 +33,7 @@ namespace umbraco.editorControls.SettingControls.Pickers mp.ID = sender.GetName().Replace(" ", "_"); - mp.AppAlias = "media"; + mp.AppAlias = Constants.Applications.Media; mp.TreeAlias = "media"; int output; diff --git a/src/umbraco.editorControls/mediapicker/mediaChooser.cs b/src/umbraco.editorControls/mediapicker/mediaChooser.cs index 5de0c24658..85a2ae4dba 100644 --- a/src/umbraco.editorControls/mediapicker/mediaChooser.cs +++ b/src/umbraco.editorControls/mediapicker/mediaChooser.cs @@ -51,7 +51,7 @@ namespace umbraco.editorControls { get { - return _showadvanced ? umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/mediaPicker.aspx" : TreeService.GetPickerUrl("media", "media"); + return _showadvanced ? umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/mediaPicker.aspx" : TreeService.GetPickerUrl(Umbraco.Core.Constants.Applications.Media, "media"); } } diff --git a/src/umbraco.editorControls/pagepicker/pagePicker.cs b/src/umbraco.editorControls/pagepicker/pagePicker.cs index 127575c27f..16693194dd 100644 --- a/src/umbraco.editorControls/pagepicker/pagePicker.cs +++ b/src/umbraco.editorControls/pagepicker/pagePicker.cs @@ -26,7 +26,7 @@ namespace umbraco.editorControls { get { - return TreeService.GetPickerUrl("content", "content"); + return TreeService.GetPickerUrl(Umbraco.Core.Constants.Applications.Content, "content"); } }