lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ContentTypes: Fixing that a validation error when adding the first field to a type breaks fields for that type, fixes #6310 #6588

Browse Source
This commit is contained in:
Lombiq 2019-08-27 22:25:34 +02:00 committed by Benedek Farkas
parent c8f5fd731e
commit f46be479a3
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs
View File

@ -492,21 +492,13 @@ namespace Orchard.ContentTypes.Controllers {
var partViewModel = _contentDefinitionService.GetPart(id);
var typeViewModel = _contentDefinitionService.GetType(id);
// If the specified Part doesn't exist, try to find a matching Type,
// where the implicit Part with the same name can be created to store Fields.
if (partViewModel == null) {
if (typeViewModel == null) return HttpNotFound();
else {
partViewModel = _contentDefinitionService.AddPart(new CreatePartViewModel { Name = typeViewModel.Name });
_contentDefinitionService.AddPartToType(partViewModel.Name, typeViewModel.Name);
}
}
if (partViewModel == null && typeViewModel == null) return HttpNotFound();
ValidateDisplayName(viewModel.DisplayName);
// Additional Display Name validation.
if (!string.IsNullOrWhiteSpace(viewModel.DisplayName) &&
if (partViewModel != null && !string.IsNullOrWhiteSpace(viewModel.DisplayName) &&
partViewModel.Fields.Any(t => string.Equals(t.DisplayName.Trim(), viewModel.DisplayName.Trim(), StringComparison.OrdinalIgnoreCase))) {
ModelState.AddModelError("DisplayName", T("A content field with this display name already exists.").Text);
}
@ -514,13 +506,13 @@ namespace Orchard.ContentTypes.Controllers {
ValidateTechnicalName(viewModel.Name);
// Additional Technical Name validation.
if (!string.IsNullOrWhiteSpace(viewModel.Name) &&
if (partViewModel != null && !string.IsNullOrWhiteSpace(viewModel.Name) &&
partViewModel.Fields.Any(t => string.Equals(t.Name.ToSafeName(), viewModel.Name.ToSafeName(), StringComparison.OrdinalIgnoreCase))) {
ModelState.AddModelError("Name", T("A content field with this technical name already exists.").Text);
}
if (!ModelState.IsValid) {
viewModel.Part = partViewModel;
viewModel.Part = partViewModel ?? new EditPartViewModel { Name = typeViewModel.Name };
viewModel.Fields = _contentDefinitionService.GetFields();
Services.TransactionManager.Cancel();
@ -529,6 +521,14 @@ namespace Orchard.ContentTypes.Controllers {
}
// If the specified Part doesn't exist, create an implicit ,
// where the implicit Part with the same name can be created to store Fields.
if (partViewModel == null) {
partViewModel = _contentDefinitionService.AddPart(new CreatePartViewModel { Name = typeViewModel.Name });
_contentDefinitionService.AddPartToType(partViewModel.Name, typeViewModel.Name);
}
try {
_contentDefinitionService.AddFieldToPart(viewModel.Name, viewModel.DisplayName, viewModel.FieldTypeName, partViewModel.Name);
}