lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-02 11:44:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

#18483: Fixing driver exceptions

Browse Source 
Work Item: 18483

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2012-02-27 10:58:38 -08:00
parent 223de80045
commit 0b7496c4e7
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs
View File

@@ -18,8 +18,12 @@ namespace Orchard.ContentManagement.Drivers {
DriverResult IContentFieldDriver.BuildDisplayShape(BuildDisplayContext context) { DriverResult IContentFieldDriver.BuildDisplayShape(BuildDisplayContext context) {
return Process(context.ContentItem, (part, field) => { return Process(context.ContentItem, (part, field) => {
DriverResult result = Display(part, field, context.DisplayType, context.New); DriverResult result = Display(part, field, context.DisplayType, context.New);
result.ContentPart = part;
result.ContentField = field; if (result != null) {
result.ContentPart = part;
result.ContentField = field;
}
return result; return result;
}); });
} }
@@ -27,8 +31,12 @@ namespace Orchard.ContentManagement.Drivers {
DriverResult IContentFieldDriver.BuildEditorShape(BuildEditorContext context) { DriverResult IContentFieldDriver.BuildEditorShape(BuildEditorContext context) {
return Process(context.ContentItem, (part, field) => { return Process(context.ContentItem, (part, field) => {
DriverResult result = Editor(part, field, context.New); DriverResult result = Editor(part, field, context.New);
result.ContentPart = part;
result.ContentField = field; if (result != null) {
result.ContentPart = part;
result.ContentField = field;
}
return result; return result;
}); });
} }
@@ -36,8 +44,12 @@ namespace Orchard.ContentManagement.Drivers {
DriverResult IContentFieldDriver.UpdateEditorShape(UpdateEditorContext context) { DriverResult IContentFieldDriver.UpdateEditorShape(UpdateEditorContext context) {
return Process(context.ContentItem, (part, field) => { return Process(context.ContentItem, (part, field) => {
DriverResult result = Editor(part, field, context.Updater, context.New); DriverResult result = Editor(part, field, context.Updater, context.New);
result.ContentPart = part;
result.ContentField = field; if (result != null) {
result.ContentPart = part;
result.ContentField = field;
}
return result; return result;
}); });
} }

18
src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs
View File

@@ -24,7 +24,11 @@ namespace Orchard.ContentManagement.Drivers {
} }
DriverResult result = Display(part, context.DisplayType, context.New); DriverResult result = Display(part, context.DisplayType, context.New);
result.ContentPart = part;
if(result != null ) {
result.ContentPart = part;
}
return result; return result;
} }
@@ -36,7 +40,11 @@ namespace Orchard.ContentManagement.Drivers {
} }
DriverResult result = Editor(part, context.New); DriverResult result = Editor(part, context.New);
result.ContentPart = part;
if (result != null) {
result.ContentPart = part;
}
return result; return result;
} }
@@ -48,7 +56,11 @@ namespace Orchard.ContentManagement.Drivers {
} }
DriverResult result = Editor(part, context.Updater, context.New); DriverResult result = Editor(part, context.Updater, context.New);
result.ContentPart = part;
if (result != null) {
result.ContentPart = part;
}
return result; return result;
} }