From 9ee0f12575bc3abc7f3308f34e0d7c7a240e03da Mon Sep 17 00:00:00 2001
From: hartvig <unknown@kiln.example.com>
Date: Fri, 20 Aug 2010 11:09:27 +0000
Subject: [PATCH] Fixes 28344

[TFS Changeset #75950]
---
 umbraco/cms/businesslogic/ContentType.cs                 | 7 +++++++
 .../umbraco/controls/ContentTypeControlNew.ascx          | 2 ++
 .../controls/ContentTypeControlNew.ascx.designer.cs      | 9 +++++++++
 3 files changed, 18 insertions(+)

diff --git a/umbraco/cms/businesslogic/ContentType.cs b/umbraco/cms/businesslogic/ContentType.cs
index 7ff03e8d2b..a0f5fa9c10 100644
--- a/umbraco/cms/businesslogic/ContentType.cs
+++ b/umbraco/cms/businesslogic/ContentType.cs
@@ -350,6 +350,13 @@ namespace umbraco.cms.businesslogic
             set
             {
                 _alias = helpers.Casing.SafeAliasWithForcingCheck(value);
+                
+                // validate if alias is empty
+                if (String.IsNullOrEmpty(_alias))
+                {
+                    throw new ArgumentOutOfRangeException("An Alias cannot be empty");
+                }
+
                 SqlHelper.ExecuteNonQuery(
                                           "update cmsContentType set alias = @alias where nodeId = @id",
                                           SqlHelper.CreateParameter("@alias", _alias),
diff --git a/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx b/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx
index 4a13b97569..740afbbed2 100644
--- a/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx
+++ b/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx
@@ -50,10 +50,12 @@
   <cc2:Pane ID="Pane3" runat="server">
     <cc2:PropertyPanel ID="pp_name" runat="server" Text="Name">
         <asp:TextBox ID="txtName" CssClass="guiInputText guiInputStandardSize" runat="server"></asp:TextBox>
+        <asp:RequiredFieldValidator ID="RequiredFieldValidator1" ControlToValidate="txtName" runat="server" ErrorMessage="Name cannot be empty!"></asp:RequiredFieldValidator>
     </cc2:PropertyPanel>
     
     <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>
     </cc2:PropertyPanel>
   </cc2:Pane>
   
diff --git a/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx.designer.cs b/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx.designer.cs
index bf58194afe..bc732a166a 100644
--- a/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx.designer.cs
+++ b/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx.designer.cs
@@ -156,6 +156,15 @@ namespace umbraco.controls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtName;
         
+        /// <summary>
+        /// RequiredFieldValidator1 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.RequiredFieldValidator RequiredFieldValidator1;
+        
         /// <summary>
         /// pp_alias control.
         /// </summary>