lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-22 21:02:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added null checks (#8511)

Browse Source 
The added null checks manage properly importing definitions that do not contain the properties.
This commit is contained in:
Matteo Piovanelli
2021-09-24 08:37:25 +02:00
committed by GitHub
parent d51418b2c1
commit e771a56c42
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Orchard.Web/Modules/Orchard.Projections/Settings/ProjectionPartEditorEvents.cs
View File

@@ -137,16 +137,21 @@ namespace Orchard.Projections.Settings {
var settings = part.Settings.GetModel<ProjectionPartSettings>(); var settings = part.Settings.GetModel<ProjectionPartSettings>();
// from identity part of the query and guid of the layout find reference // from identity part of the query and guid of the layout find reference
settings.QueryLayoutRecordId = GetQueryLayoutRecord(settings.IdentityQueryLayoutRecord); settings.QueryLayoutRecordId = string.IsNullOrWhiteSpace(settings.IdentityQueryLayoutRecord)
? "-1" : GetQueryLayoutRecord(settings.IdentityQueryLayoutRecord);
List<string> identityForFilterQuery = new List<string>(); if (!string.IsNullOrWhiteSpace(settings.IdentityFilterQueryRecord)) {
foreach (var record in settings.IdentityFilterQueryRecord.Split('&').ToList()) { List<string> identityForFilterQuery = new List<string>();
var correctId = GetQueryLayoutRecord(record); foreach (var record in settings.IdentityFilterQueryRecord.Split('&').ToList()) {
if (!string.IsNullOrEmpty(correctId)) { var correctId = GetQueryLayoutRecord(record);
identityForFilterQuery.Add(correctId); if (!string.IsNullOrEmpty(correctId)) {
identityForFilterQuery.Add(correctId);
}
} }
settings.FilterQueryRecordId = string.Join("&", identityForFilterQuery);
} else {
settings.FilterQueryRecordId = string.Empty;
} }
settings.FilterQueryRecordId = string.Join("&", identityForFilterQuery);
_contentDefinitionManager.AlterTypeDefinition(context.ContentTypeDefinition.Name, cfg => cfg _contentDefinitionManager.AlterTypeDefinition(context.ContentTypeDefinition.Name, cfg => cfg
.WithPart(part.PartDefinition.Name, .WithPart(part.PartDefinition.Name,
@@ -261,4 +266,4 @@ namespace Orchard.Projections.Settings {
return String.IsNullOrWhiteSpace(l.Description) ? descriptor.Display(new LayoutContext { State = FormParametersHelper.ToDynamic(l.State) }).Text : l.Description; return String.IsNullOrWhiteSpace(l.Description) ? descriptor.Display(new LayoutContext { State = FormParametersHelper.ToDynamic(l.State) }).Text : l.Description;
} }
} }
} }