diff --git a/.hgsubstate b/.hgsubstate index f6aafdbac..df86f228f 100644 --- a/.hgsubstate +++ b/.hgsubstate @@ -3,4 +3,4 @@ 204bdef384f41bb5e463bed6b98a056945a7d839 src/Orchard.Web/Modules/Orchard.Rules ce578373f907c0a55fd91229a344f0755f290174 src/Orchard.Web/Modules/Orchard.TaskLease cf73534c335f39e6d9695c2a0ce64c426d1be9f2 src/Orchard.Web/Modules/Orchard.Tokens -12942a73f0aca73527e73f712c60cd0ca64446b0 src/orchard.web/modules/Orchard.Fields +08eadecb5e5fae52e8b4c7d1c60f29e51c63b2ca src/orchard.web/modules/Orchard.Fields diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs index 2c8e5d07a..db04dadad 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs @@ -432,12 +432,12 @@ namespace Orchard.ContentTypes.Controllers { _contentDefinitionService.AddFieldToPart(viewModel.Name, viewModel.DisplayName, viewModel.FieldTypeName, partViewModel.Name); } catch (Exception ex) { - Services.Notifier.Information(T("The \"{0}\" field was not added. {1}", viewModel.Name, ex.Message)); + Services.Notifier.Information(T("The \"{0}\" field was not added. {1}", viewModel.DisplayName, ex.Message)); Services.TransactionManager.Cancel(); return AddFieldTo(id); } - Services.Notifier.Information(T("The \"{0}\" field has been added.", viewModel.Name)); + Services.Notifier.Information(T("The \"{0}\" field has been added.", viewModel.DisplayName)); if (typeViewModel != null) { return RedirectToAction("Edit", new {id});