From 980e8e84a6b6c3a19a0d87183d46dd38faeccce0 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 10 Mar 2014 17:26:04 +1100
Subject: [PATCH 1/2] Fixes: U4-4353 You are able to create duplicate
 content/media/member type's with the same alias

---
 .../Repositories/ContentTypeBaseRepository.cs |  26 ++++
 .../DataTypeDefinitionRepository.cs           |  12 ++
 .../Repositories/RepositoryBase.cs            |  30 +++-
 .../controls/ContentTypeControlNew.ascx       |   3 +-
 .../controls/ContentTypeControlNew.ascx.cs    |   1 +
 .../ContentTypeControlNew.ascx.designer.cs    |   2 +
 src/Umbraco.Web.UI/umbraco/create/simple.ascx |   2 +-
 .../developer/DataTypes/editDatatype.aspx     |   1 +
 src/Umbraco.Web/Umbraco.Web.csproj            |  13 +-
 .../controls/ContentTypeControlNew.ascx.cs    |  21 ++-
 .../umbraco/create/nodeType.ascx.cs           |  35 ++---
 .../umbraco/create/simple.ascx.cs             |   2 +-
 .../developer/DataTypes/editDatatype.aspx     |  27 ----
 .../developer/DataTypes/editDatatype.aspx.cs  | 140 ++++++++++++++----
 .../DataTypes/editDatatype.aspx.designer.cs   | 105 -------------
 .../umbraco/settings/EditMediaType.aspx.cs    |  19 ---
 .../datatype/DataTypeDefinition.cs            |  27 +++-
 .../businesslogic/media/MediaType.cs          |   4 +-
 18 files changed, 245 insertions(+), 225 deletions(-)
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.designer.cs

diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
index 5b761ad559..da259c1594 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
@@ -11,6 +12,7 @@ using Umbraco.Core.Persistence.Caching;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.Relators;
+using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Persistence.Repositories
@@ -63,6 +65,17 @@ namespace Umbraco.Core.Persistence.Repositories
 
         protected void PersistNewBaseContentType(ContentTypeDto dto, IContentTypeComposition entity)
         {
+            //Cannot add a duplicate content type type
+            var exists = Database.ExecuteScalar<int>(@"SELECT COUNT(*) FROM cmsContentType
+INNER JOIN umbracoNode ON cmsContentType.nodeId = umbracoNode.id
+WHERE cmsContentType." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("alias") + @"= @alias
+AND umbracoNode.nodeObjectType = @objectType",
+                new { alias = entity.Alias, objectType = NodeObjectTypeId });
+            if (exists > 0)
+            {
+                throw new DuplicateNameException("An item with the alias " + entity.Alias + " already exists");
+            }
+
             //Logic for setting Path, Level and SortOrder
             var parent = Database.First<NodeDto>("WHERE id = @ParentId", new { ParentId = entity.ParentId });
             int level = parent.Level + 1;
@@ -165,6 +178,19 @@ namespace Umbraco.Core.Persistence.Repositories
 
         protected void PersistUpdatedBaseContentType(ContentTypeDto dto, IContentTypeComposition entity)
         {
+
+            //Cannot update to a duplicate alias
+            var exists = Database.ExecuteScalar<int>(@"SELECT COUNT(*) FROM cmsContentType
+INNER JOIN umbracoNode ON cmsContentType.nodeId = umbracoNode.id
+WHERE cmsContentType." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("alias") + @"= @alias
+AND umbracoNode.nodeObjectType = @objectType
+AND umbracoNode.id <> @id",
+                new { id = dto.NodeId, alias = entity.Alias, objectType = NodeObjectTypeId });
+            if (exists > 0)
+            {
+                throw new DuplicateNameException("An item with the alias " + entity.Alias + " already exists");
+            }
+
             var propertyGroupFactory = new PropertyGroupFactory(entity.Id);
 
             var nodeDto = dto.NodeDto;
diff --git a/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
index d8bfe62deb..3798bb53d9 100644
--- a/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
@@ -165,6 +165,18 @@ WHERE umbracoNode." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("te
 
         protected override void PersistUpdatedItem(IDataTypeDefinition entity)
         {
+
+            //Cannot change to a duplicate alias
+            var exists = Database.ExecuteScalar<int>(@"SELECT COUNT(*) FROM cmsDataType
+INNER JOIN umbracoNode ON cmsDataType.nodeId = umbracoNode.id
+WHERE umbracoNode." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("text") + @"= @name
+AND umbracoNode.id <> @id", 
+                    new { id = entity.Id, name = entity.Name });
+            if (exists > 0)
+            {
+                throw new DuplicateNameException("A data type with the name " + entity.Name + " already exists");
+            }
+
             //Updates Modified date and Version Guid
             ((DataTypeDefinition)entity).UpdatingEntity();
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
index 05b8c84fd1..737ed7daef 100644
--- a/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
@@ -220,8 +220,19 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <param name="entity"></param>
         public virtual void PersistNewItem(IEntity entity)
         {
-            PersistNewItem((TEntity)entity);
-            _cache.Save(typeof(TEntity), entity);
+            try
+            {
+                PersistNewItem((TEntity)entity);
+                _cache.Save(typeof(TEntity), entity);
+            }
+            catch (Exception)
+            {
+                //if an exception is thrown we need to remove the entry from cache, this is ONLY a work around because of the way
+                // that we cache entities: http://issues.umbraco.org/issue/U4-4259
+                _cache.Delete(typeof (TEntity), entity);
+                throw;
+            }
+            
         }
 
         /// <summary>
@@ -230,8 +241,19 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <param name="entity"></param>
         public virtual void PersistUpdatedItem(IEntity entity)
         {
-            PersistUpdatedItem((TEntity)entity);
-            _cache.Save(typeof(TEntity), entity);
+            try
+            {
+                PersistUpdatedItem((TEntity)entity);
+                _cache.Save(typeof(TEntity), entity);
+            }
+            catch (Exception)
+            {
+                //if an exception is thrown we need to remove the entry from cache, this is ONLY a work around because of the way
+                // that we cache entities: http://issues.umbraco.org/issue/U4-4259
+                _cache.Delete(typeof (TEntity), entity);
+                throw;
+            }
+            
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
index b803f94494..3bb2fad469 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
+++ b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
@@ -49,7 +49,8 @@
     
     <cc2:PropertyPanel ID="pp_alias" runat="server" Text="Alias">
          <asp:TextBox ID="txtAlias" CssClass="guiInputText guiInputStandardSize" runat="server"></asp:TextBox>
-         <asp:RequiredFieldValidator ControlToValidate="txtAlias" runat="server" ErrorMessage="Alias cannot be empty!"></asp:RequiredFieldValidator>
+         <asp:RequiredFieldValidator Display="Dynamic" ControlToValidate="txtAlias" runat="server" ErrorMessage="Alias cannot be empty!"></asp:RequiredFieldValidator>
+        <asp:CustomValidator Display="Dynamic" runat="server" ID="DuplicateAliasValidator" ErrorMessage="A type with this alias already exists"></asp:CustomValidator>
     </cc2:PropertyPanel>
   </cc2:Pane>
   
diff --git a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx.cs b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx.cs
index c3459b752e..28250d9fa4 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx.cs
+++ b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
+using System.Web.UI.WebControls;
 
 namespace Umbraco.Web.UI.Umbraco.Controls
 {
diff --git a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx.designer.cs b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx.designer.cs
index 582c67837d..c17c27becf 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx.designer.cs
+++ b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx.designer.cs
@@ -11,5 +11,7 @@ namespace Umbraco.Web.UI.Umbraco.Controls {
     
     
     public partial class ContentTypeControlNew {
+        
+        
     }
 }
diff --git a/src/Umbraco.Web.UI/umbraco/create/simple.ascx b/src/Umbraco.Web.UI/umbraco/create/simple.ascx
index 16ec4cdaad..04f63ecaff 100644
--- a/src/Umbraco.Web.UI/umbraco/create/simple.ascx
+++ b/src/Umbraco.Web.UI/umbraco/create/simple.ascx
@@ -6,7 +6,7 @@
 <asp:TextBox id="rename" CssClass="bigInput" Runat="server" width="350px"></asp:TextBox>
 <!-- added to support missing postback on enter in IE -->
 <asp:TextBox runat="server" style="visibility:hidden;display:none;" ID="Textbox1"/>
-<asp:CustomValidator runat="server" ID="CustomValidation" style="color:#8a1f11;display:block;"></asp:CustomValidator>
+<asp:CustomValidator runat="server" ID="CustomValidation" ForeColor="red" style="display:block;"></asp:CustomValidator>
 </div>
 
 <div style="padding-top: 25px;">
diff --git a/src/Umbraco.Web.UI/umbraco/developer/DataTypes/editDatatype.aspx b/src/Umbraco.Web.UI/umbraco/developer/DataTypes/editDatatype.aspx
index 12f830e9eb..48d035061d 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/DataTypes/editDatatype.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/DataTypes/editDatatype.aspx
@@ -8,6 +8,7 @@
         <cc1:Pane ID="pane_control" runat="server">
             <cc1:PropertyPanel ID="pp_name" runat="server">
                 <asp:TextBox ID="txtName" runat="server"></asp:TextBox>
+                <asp:CustomValidator Display="Dynamic" runat="server" ID="DuplicateNameValidator" ErrorMessage="A data type with this name already exists"></asp:CustomValidator>
             </cc1:PropertyPanel>
             <cc1:PropertyPanel ID="pp_renderControl" runat="server">
                 <asp:DropDownList ID="ddlRenderControl" runat="server" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index b7baea2f1f..b74f0f1c14 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -430,6 +430,9 @@
     <Compile Include="umbraco.presentation\umbraco\dashboard\ChangePassword.ascx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="umbraco.presentation\umbraco\developer\DataTypes\editDatatype.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="umbraco.presentation\umbraco\developer\Packages\directoryBrowser.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
@@ -1210,13 +1213,6 @@
     <Compile Include="umbraco.presentation\umbraco\developer\autoDoc.aspx.designer.cs">
       <DependentUpon>autoDoc.aspx</DependentUpon>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\DataTypes\editDatatype.aspx.cs">
-      <DependentUpon>editDatatype.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\developer\DataTypes\editDatatype.aspx.designer.cs">
-      <DependentUpon>editDatatype.aspx</DependentUpon>
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\developer\Packages\BrowseRepository.aspx.cs">
       <DependentUpon>BrowseRepository.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -1932,9 +1928,6 @@
     </Content>
     <Content Include="umbraco.presentation\umbraco\developer\Macros\assemblyBrowser.aspx" />
     <Content Include="umbraco.presentation\umbraco\developer\autoDoc.aspx" />
-    <Content Include="umbraco.presentation\umbraco\developer\DataTypes\editDatatype.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
     <Content Include="umbraco.presentation\umbraco\developer\Xslt\getXsltStatus.asmx" />
     <Content Include="umbraco.presentation\umbraco\developer\Cache\viewCacheItem.aspx" />
     <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx" />
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
index a81ff499d9..9138a470e8 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
@@ -334,7 +334,17 @@ namespace umbraco.controls
                         SavingContentType(_contentType);
                     }
 
-                    _contentType.Save();
+                    try
+                    {
+                        _contentType.Save();
+                    }
+                    catch (DuplicateNameException ex)
+                    {
+                        DuplicateAliasValidator.IsValid = false;
+                        asyncState.SaveArgs.IconType = BasePage.speechBubbleIcon.error;
+                        asyncState.SaveArgs.Message = ex.Message;
+                        return;
+                    }
 
                     Trace.Write("ContentTypeControlNew", "task completing");
                 };
@@ -1628,5 +1638,14 @@ Umbraco.Controls.TabView.onActiveTabChange(function(tabviewid, tabid, tabs) {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal checkTxtAliasJs;
+
+        /// <summary>
+        /// DuplicateAliasValidator control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.CustomValidator DuplicateAliasValidator;
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
index be6f59cab4..8953793caa 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
@@ -1,4 +1,6 @@
+using System.Globalization;
 using Umbraco.Core;
+using Umbraco.Web;
 
 namespace umbraco.cms.presentation.create.controls
 {
@@ -19,20 +21,20 @@ namespace umbraco.cms.presentation.create.controls
 	{
 
 
-		protected void Page_Load(object sender, System.EventArgs e)
+		protected void Page_Load(object sender, EventArgs e)
 		{
 			sbmt.Text = ui.Text("create");
             if (!IsPostBack)
             {
-                string nodeId = umbraco.helper.Request("nodeId");
+                string nodeId = Request.GetItemAsString("nodeId");
                 if (String.IsNullOrEmpty(nodeId) || nodeId == "init")
                 {
                     masterType.Attributes.Add("style", "width: 350px;");
                     masterType.Items.Add(new ListItem(ui.Text("none") + "...", "0"));
-                    foreach (cms.businesslogic.web.DocumentType dt in cms.businesslogic.web.DocumentType.GetAllAsList())
+                    foreach (DocumentType dt in DocumentType.GetAllAsList())
                     {
                         //                    if (dt.MasterContentType == 0)
-                        masterType.Items.Add(new ListItem(dt.Text, dt.Id.ToString()));
+                        masterType.Items.Add(new ListItem(dt.Text, dt.Id.ToString(CultureInfo.InvariantCulture)));
                     }
                 }
                 else
@@ -56,7 +58,7 @@ namespace umbraco.cms.presentation.create.controls
                 e.IsValid = false;
         }
 
-		protected void sbmt_Click(object sender, System.EventArgs e)
+		protected void sbmt_Click(object sender, EventArgs e)
 		{
 			if (Page.IsValid) 
 			{
@@ -65,10 +67,10 @@ namespace umbraco.cms.presentation.create.controls
 					createTemplateVal = 1;
 
                 // check master type
-                string masterTypeVal = String.IsNullOrEmpty(umbraco.helper.Request("nodeId")) || umbraco.helper.Request("nodeId") == "init" ? masterType.SelectedValue : umbraco.helper.Request("nodeId");
+                string masterTypeVal = String.IsNullOrEmpty(Request.GetItemAsString("nodeId")) || Request.GetItemAsString("nodeId") == "init" ? masterType.SelectedValue : Request.GetItemAsString("nodeId");
 
 				string returnUrl = umbraco.presentation.create.dialogHandler_temp.Create(
-					umbraco.helper.Request("nodeType"),
+                    Request.GetItemAsString("nodeType"),
                     int.Parse(masterTypeVal),
 					createTemplateVal,
 					rename.Text);
@@ -81,24 +83,5 @@ namespace umbraco.cms.presentation.create.controls
 			}
 		
 		}
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e)
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		///		Required method for Designer support - do not modify
-		///		the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-
-		}
-		#endregion
 	}
 }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
index 974dbaabbe..ec3ca3dc95 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
@@ -42,7 +42,7 @@ namespace umbraco.cms.presentation.create.controls
                 }
                 catch (Exception ex)
                 {
-                    CustomValidation.ErrorMessage = ex.Message;
+                    CustomValidation.ErrorMessage = "* " + ex.Message;
                     CustomValidation.IsValid = false;
                 }
             }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx
deleted file mode 100644
index 86066a5c63..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx
+++ /dev/null
@@ -1,27 +0,0 @@
-<%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoPage.Master" Title="Edit data type"
-    CodeBehind="editDatatype.aspx.cs" AutoEventWireup="True" Inherits="umbraco.cms.presentation.developer.editDatatype" %>
-
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-<asp:Content ContentPlaceHolderID="body" runat="server">
-    <cc1:UmbracoPanel ID="Panel1" runat="server" Width="496px" Height="584px">
-        <cc1:Pane ID="pane_control" runat="server">
-            <cc1:PropertyPanel ID="pp_name" runat="server">
-                <asp:TextBox ID="txtName" runat="server"></asp:TextBox>
-            </cc1:PropertyPanel>
-            <cc1:PropertyPanel ID="pp_renderControl" runat="server">
-                <asp:DropDownList ID="ddlRenderControl" runat="server" />
-            </cc1:PropertyPanel>
-            <cc1:PropertyPanel ID="pp_guid" runat="server">
-                <asp:Literal ID="litGuid" runat="server" />
-            </cc1:PropertyPanel>
-        </cc1:Pane>
-        <cc1:Pane ID="pane_settings" runat="server">
-            <asp:PlaceHolder ID="plcEditorPrevalueControl" runat="server"></asp:PlaceHolder>
-        </cc1:Pane>
-    </cc1:UmbracoPanel>
-    <script type="text/javascript">
-        jQuery(document).ready(function () {
-            UmbClientMgr.appActions().bindSaveShortCut();
-        });
-    </script>
-</asp:Content>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
index 5cf50baa6c..d713a9b689 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
@@ -1,9 +1,11 @@
-using System;
+using System;
 using System.Collections;
+using System.Data;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using umbraco.cms.presentation.Trees;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 
 namespace umbraco.cms.presentation.developer
 {
@@ -64,17 +66,17 @@ namespace umbraco.cms.presentation.developer
 
                 ClientTools
                     .SetActiveTreeType(TreeDefinitionCollection.Instance.FindTree<loadDataTypes>().Tree.Alias)
-                    .SyncTree("-1,init," + _id.ToString(), false);
+                    .SyncTree("-1,init," + _id, false);
 
             }
 
             if (dt.DataType != null)
                 litGuid.Text = dt.DataType.Id.ToString();
-            Panel1.Text = umbraco.ui.Text("edit") + " datatype: " + dt.Text;
-            insertPrevalueEditor();
+            Panel1.Text = ui.Text("edit") + " datatype: " + dt.Text;
+            InsertPrevalueEditor();
         }
 
-        private void insertPrevalueEditor()
+        private void InsertPrevalueEditor()
         {
             try
             {
@@ -93,7 +95,10 @@ namespace umbraco.cms.presentation.developer
                     plcEditorPrevalueControl.Controls.Add(new LiteralControl("No editor control selected"));
                 }
             }
-            catch { }
+            catch (Exception ex)
+            {
+                LogHelper.Error<editDatatype>("An error occurred inserting pre-value editor", ex);
+            }
 
         }
 
@@ -106,41 +111,122 @@ namespace umbraco.cms.presentation.developer
             dt.Text = txtName.Text;
 
             dt.DataType = f.DataType(new Guid(ddlRenderControl.SelectedValue));
-            dt.Save();
 
-            ClientTools.ShowSpeechBubble(speechBubbleIcon.save, ui.Text("speechBubbles", "dataTypeSaved", null), "");
-
-            ClientTools.SyncTree(dt.Path, true);
+            try
+            {
+                dt.Save();
+                ClientTools.ShowSpeechBubble(speechBubbleIcon.save, ui.Text("speechBubbles", "dataTypeSaved", null), "");
+                ClientTools.SyncTree(dt.Path, true);
+            }
+            catch (DuplicateNameException)
+            {
+                DuplicateNameValidator.IsValid = false;
+                ClientTools.ShowSpeechBubble(speechBubbleIcon.error, "A data type with the name " + dt.Text + " already exists", "");
+            }            
         }
 
-
-        #region Web Form Designer generated code
-
-
         override protected void OnInit(EventArgs e)
         {
             save = Panel1.Menu.NewImageButton();
             save.ID = "save";
-            save.Click += new System.Web.UI.ImageClickEventHandler(save_click);
+            save.Click += save_click;
             save.ImageUrl = SystemDirectories.Umbraco + "/images/editor/save.gif";
 
             Panel1.hasMenu = true;
 
-            //
-            // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-            //
-            InitializeComponent();
             base.OnInit(e);
         }
 
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
+        protected CustomValidator DuplicateNameValidator;
 
-        }
-        #endregion
+        /// <summary>
+        /// Panel1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.UmbracoPanel Panel1;
+
+        /// <summary>
+        /// pane_control control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.Pane pane_control;
+
+        /// <summary>
+        /// pp_name control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.PropertyPanel pp_name;
+
+        /// <summary>
+        /// txtName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtName;
+
+        /// <summary>
+        /// pp_renderControl control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.PropertyPanel pp_renderControl;
+
+        /// <summary>
+        /// ddlRenderControl control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.DropDownList ddlRenderControl;
+
+        /// <summary>
+        /// pp_guid control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.PropertyPanel pp_guid;
+
+        /// <summary>
+        /// litGuid control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Literal litGuid;
+
+        /// <summary>
+        /// pane_settings control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.Pane pane_settings;
+
+        /// <summary>
+        /// plcEditorPrevalueControl control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.PlaceHolder plcEditorPrevalueControl;
     }
 }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.designer.cs
deleted file mode 100644
index 9d1d8fc550..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.designer.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace umbraco.cms.presentation.developer {
-    
-    
-    public partial class editDatatype {
-        
-        /// <summary>
-        /// Panel1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.UmbracoPanel Panel1;
-        
-        /// <summary>
-        /// pane_control control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane pane_control;
-        
-        /// <summary>
-        /// pp_name control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel pp_name;
-        
-        /// <summary>
-        /// txtName control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox txtName;
-        
-        /// <summary>
-        /// pp_renderControl control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel pp_renderControl;
-        
-        /// <summary>
-        /// ddlRenderControl control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList ddlRenderControl;
-        
-        /// <summary>
-        /// pp_guid control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel pp_guid;
-        
-        /// <summary>
-        /// litGuid control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Literal litGuid;
-        
-        /// <summary>
-        /// pane_settings control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane pane_settings;
-        
-        /// <summary>
-        /// plcEditorPrevalueControl control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.PlaceHolder plcEditorPrevalueControl;
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.cs
index a20106a0cb..93e060c01d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.cs
@@ -48,24 +48,5 @@ namespace umbraco.cms.presentation.settings
             return false;
         }
 
-        #region Web Form Designer generated code
-        override protected void OnInit(EventArgs e)
-        {
-            //
-            // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-            //
-            InitializeComponent();
-            base.OnInit(e);
-        }
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-
-        }
-        #endregion
     }
 }
diff --git a/src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs b/src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
index 4466d2c621..7334a1b585 100644
--- a/src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
+++ b/src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
@@ -28,8 +28,9 @@ namespace umbraco.cms.businesslogic.datatype
 
         private static Guid _objectType = new Guid(Constants.ObjectTypes.DataType);
 	    private string _dbType;
+        private string _text1;
 
-	    #endregion
+        #endregion
 
         #region Constructors
 
@@ -48,6 +49,13 @@ namespace umbraco.cms.businesslogic.datatype
         #endregion
 
         #region Public Properties
+
+        public override string Text
+        {
+            get { return _text1 ?? (_text1 = base.Text); }
+            set { _text1 = value; }
+        }
+
         /// <summary>
         /// The associated datatype, which delivers the methods for editing data, editing prevalues see: umbraco.interfaces.IDataType
         /// </summary>
@@ -122,6 +130,23 @@ namespace umbraco.cms.businesslogic.datatype
         /// </summary>
         public override void Save()
         {
+            //Cannot change to a duplicate alias
+            var exists = Database.ExecuteScalar<int>(@"SELECT COUNT(*) FROM cmsDataType
+INNER JOIN umbracoNode ON cmsDataType.nodeId = umbracoNode.id
+WHERE umbracoNode." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("text") + @"= @name
+AND umbracoNode.id <> @id",
+                    new { id = this.Id, name = this.Text });
+            if (exists > 0)
+            {
+                ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheItem(
+                    string.Format("{0}{1}", CacheKeys.DataTypeCacheKey, this.Id));
+
+                throw new DuplicateNameException("A data type with the name " + this.Text + " already exists");
+            }
+
+            //this actually does the persisting.
+            base.Text = _text1;
+
             OnSaving(EventArgs.Empty);
         }
 
diff --git a/src/umbraco.cms/businesslogic/media/MediaType.cs b/src/umbraco.cms/businesslogic/media/MediaType.cs
index c597774472..5f00c9388a 100644
--- a/src/umbraco.cms/businesslogic/media/MediaType.cs
+++ b/src/umbraco.cms/businesslogic/media/MediaType.cs
@@ -91,12 +91,12 @@ namespace umbraco.cms.businesslogic.media
         /// <param name="Text">The name of the MediaType</param>
         /// <returns>The new MediaType</returns>
         [Obsolete("Obsolete, Use Umbraco.Core.Models.MediaType and Umbraco.Core.Services.ContentTypeService.Save()", false)]
-        public static MediaType MakeNew(BusinessLogic.User u, string Text)
+        public static MediaType MakeNew(User u, string Text)
         {
             return MakeNew(u, Text, -1);
         }
 
-        internal static MediaType MakeNew(BusinessLogic.User u, string text, int parentId)
+        internal static MediaType MakeNew(User u, string text, int parentId)
         {
             var mediaType = new Umbraco.Core.Models.MediaType(parentId) { Name = text, Alias = text, CreatorId = u.Id, Thumbnail = "folder.png", Icon = "folder.gif" };
             ApplicationContext.Current.Services.ContentTypeService.Save(mediaType, u.Id);

From 3626d5b79d3c8a6a2dea801924150ecbea8e1632 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 10 Mar 2014 17:27:22 +1100
Subject: [PATCH 2/2] fixes unit tests

---
 .../Membership/UmbracoServiceMembershipProviderTests.cs     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs b/src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs
index 64305d6b1c..99ec6dbef2 100644
--- a/src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs
+++ b/src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs
@@ -95,7 +95,7 @@ namespace Umbraco.Tests.Membership
             mServiceMock.Setup(service => service.GetDefaultMemberType()).Returns("Member");
             mServiceMock.Setup(
                 service => service.CreateWithIdentity(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
-                        .Callback((string u, string e, string p, string m, bool b) =>
+                        .Callback((string u, string e, string p, string m) =>
                             {
                                 createdMember = new Member("test", e, u, p, memberType);
                             })
@@ -126,7 +126,7 @@ namespace Umbraco.Tests.Membership
             mServiceMock.Setup(service => service.GetDefaultMemberType()).Returns("Member");
             mServiceMock.Setup(
                 service => service.CreateWithIdentity(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
-                        .Callback((string u, string e, string p, string m, bool b) =>
+                        .Callback((string u, string e, string p, string m) =>
                             {
                                 createdMember = new Member("test", e, u, p, memberType);
                             })
@@ -159,7 +159,7 @@ namespace Umbraco.Tests.Membership
             mServiceMock.Setup(service => service.GetDefaultMemberType()).Returns("Member");
             mServiceMock.Setup(
                 service => service.CreateWithIdentity(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
-                        .Callback((string u, string e, string p, string m, bool b) =>
+                        .Callback((string u, string e, string p, string m) =>
                         {
                             createdMember = new Member("test", e, u, p, memberType);
                         })