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

Removing display type alternates from Fields and Content Parts

Browse Source 
--HG--
branch : dev
This commit is contained in:
Sebastien Ros
2011-02-25 16:51:43 -08:00
parent 14aceeb4c2
commit ca6736525d
2 changed files with 0 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,6 @@ namespace Orchard.ContentManagement.Drivers {
var fieldName = differentiator ?? String.Empty;
var partName = part != null ? part.PartDefinition.Name : String.Empty;
var contentType = part != null ? part.ContentItem.ContentType : String.Empty;
var displayType = metadata.DisplayType ?? String.Empty;
var dynamicType = string.Equals(partName, contentType, StringComparison.Ordinal);
// [ShapeType__FieldName] e.g. Fields/Common.Text-Teaser
@@ -95,11 +94,6 @@ namespace Orchard.ContentManagement.Drivers {
metadata.Alternates.Add(shapeType + "__" + contentType + "__" + partName);
}
// [ShapeType]_[DisplayType]__[FieldName] e.g. Fields/Common.Text-Teaser.Summary
if ( !string.IsNullOrEmpty(displayType) && !string.IsNullOrEmpty(fieldName) ) {
metadata.Alternates.Add(shapeType + "_" + displayType + "__" + fieldName);
}
// [ShapeType]__[PartName]__[FieldName] e.g. Fields/Common.Text-TeaserPart-Teaser
if ( !string.IsNullOrEmpty(partName) && !string.IsNullOrEmpty(fieldName) ) {
metadata.Alternates.Add(shapeType + "__" + partName + "__" + fieldName);
@@ -115,26 +109,6 @@ namespace Orchard.ContentManagement.Drivers {
metadata.Alternates.Add(shapeType + "__" + contentType + "__" + partName );
}
// [ShapeType]_[DisplayType]__[PartName] e.g. Fields/Common.Text-TeaserPart.Summary
if ( !string.IsNullOrEmpty(displayType) && !string.IsNullOrEmpty(partName) ) {
metadata.Alternates.Add(shapeType + "_" + displayType + "__" + partName);
}
// [ShapeType]_[DisplayType]__[ContentType]__[PartName] e.g. Fields/Common.Text-Blog-TeaserPart.Summary
if ( !string.IsNullOrEmpty(displayType) && !string.IsNullOrEmpty(contentType) && !string.IsNullOrEmpty(partName) && !dynamicType ) {
metadata.Alternates.Add(shapeType + "_" + displayType + "__" + contentType + "__" + partName);
}
// [ShapeType]_[DisplayType]__[PartName]__[FieldName] e.g. Fields/Common.Text-TeaserPart-Teaser.Summary
if ( !string.IsNullOrEmpty(displayType) && !string.IsNullOrEmpty(partName) && !string.IsNullOrEmpty(fieldName) ) {
metadata.Alternates.Add(shapeType + "_" + displayType + "__" + partName + "__" + fieldName);
}
// [ShapeType]_[DisplayType]__[ContentType]__[PartName]__[FieldName] e.g. Fields/Common.Text-Blog-TeaserPart-Teaser.Summary
if ( !string.IsNullOrEmpty(displayType) && !string.IsNullOrEmpty(contentType) && !string.IsNullOrEmpty(partName) && !dynamicType && !string.IsNullOrEmpty(fieldName) ) {
metadata.Alternates.Add(shapeType + "_" + displayType + "__" + contentType + "__" + partName + "__" + fieldName);
}
return shape;
}

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

@@ -57,7 +57,6 @@ namespace Orchard.ContentManagement.Drivers {
var id = part != null ? part.ContentItem.Id.ToString() : String.Empty;
var shapeType = metadata.Type;
var contentType = part != null ? part.ContentItem.ContentType : String.Empty;
var displayType = metadata.DisplayType ?? String.Empty;
// [ShapeType]__[Id] e.g. Parts/Common.Metadata-42
if ( !string.IsNullOrEmpty(id) ) {
@@ -69,21 +68,6 @@ namespace Orchard.ContentManagement.Drivers {
metadata.Alternates.Add(shapeType + "__" + contentType);
}
// [ShapeType]_[DisplayType] e.g. Parts/Common.Metadata.Summary
if ( !string.IsNullOrEmpty(displayType) ) {
metadata.Alternates.Add(shapeType + "_" + displayType);
}
// [ShapeType]_[DisplayType]__[ContentType] e.g. Parts/Common.Metadata-BlogPost.Summary
if ( !string.IsNullOrEmpty(displayType) && !string.IsNullOrEmpty(contentType) ) {
metadata.Alternates.Add(shapeType + "_" + displayType + "__" + contentType);
}
// [ShapeType]_[DisplayType]__[Id] e.g. Parts/Common.Metadata-42.Summary
if ( !string.IsNullOrEmpty(displayType) && !string.IsNullOrEmpty(id) ) {
metadata.Alternates.Add(shapeType + "_" + displayType + "__" + id);
}
return shape;
}