From 6a8ee766970272aea4b4e7b6ab4c9e7c24034d36 Mon Sep 17 00:00:00 2001
From: Renaud Paquay <rpaquay@microsoft.com>
Date: Sun, 9 Jan 2011 10:35:44 -0800
Subject: [PATCH] Fix Work Item: 16622

--HG--
branch : 1.x
---
 .../Modules/Orchard.ContentTypes/Controllers/AdminController.cs | 2 +-
 .../Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs
index 8a0eac55f..0db148a32 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs
@@ -104,7 +104,7 @@ namespace Orchard.ContentTypes.Controllers {
 
             var edited = new EditTypeViewModel();
             TryUpdateModel(edited);
-            typeViewModel.DisplayName = edited.DisplayName;
+            typeViewModel.DisplayName = edited.DisplayName ?? string.Empty;
 
             if ( String.IsNullOrWhiteSpace(typeViewModel.DisplayName) ) {
                 ModelState.AddModelError("DisplayName", T("The Content Type name can't be empty.").ToString());
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs
index 4fb051533..315bb4574 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs
@@ -23,7 +23,6 @@ namespace Orchard.ContentTypes.ViewModels {
         }
 
         public string Name { get; set; }
-        [Required]
         public string DisplayName { get; set; }
         public SettingsDictionary Settings { get; set; }
         public IEnumerable<EditPartFieldViewModel> Fields { get; set; }