From ac978b665b81b1e0d70594af53b94d6d699a7955 Mon Sep 17 00:00:00 2001 From: Hannan Azam Khan Date: Thu, 9 Feb 2017 18:00:18 +0500 Subject: [PATCH] Fixes #7493 TextFieldDriver doesn't export its tag if content is empty (#7510) * TextFieldDriver doesn't export its tag if content is empty * Null check implemented , string.Empty returned * TextFieldDriver doesn't export its tag if content is empty #7493 * TextFieldDriver doesn't export its tag if content is empty #7493 --- src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs | 3 +-- .../Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs | 3 +-- .../Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs | 4 +--- .../Orchard.Fields/Drivers/EnumerationFieldDriver.cs | 3 +-- .../Modules/Orchard.Fields/Drivers/InputFieldDriver.cs | 3 +-- .../Modules/Orchard.Fields/Drivers/LinkFieldDriver.cs | 8 +++----- .../Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs | 3 +-- .../Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs | 7 ++----- 8 files changed, 11 insertions(+), 23 deletions(-) diff --git a/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs b/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs index 868b1c8ca..a4e57942a 100644 --- a/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs +++ b/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs @@ -84,8 +84,7 @@ namespace Orchard.Core.Common.Drivers { } protected override void Exporting(ContentPart part, TextField field, ExportContentContext context) { - if (!String.IsNullOrEmpty(field.Value)) - context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Text", field.Value); + context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Text", field.Value); } protected override void Describe(DescribeMembersContext context) { diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs index 116c3a013..09dcda02f 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs @@ -62,8 +62,7 @@ namespace Orchard.Fields.Drivers { } protected override void Exporting(ContentPart part, BooleanField field, ExportContentContext context) { - if (field.Value.HasValue) - context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Value", field.Value); + context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Value", field.Value); } protected override void Describe(DescribeMembersContext context) { diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs index 8fac42140..b698a972d 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs @@ -165,9 +165,7 @@ namespace Orchard.Fields.Drivers { } protected override void Exporting(ContentPart part, DateTimeField field, ExportContentContext context) { - var value = field.Storage.Get(null); - if (value != DateTime.MinValue) - context.Element(GetPrefix(field, part)).SetAttributeValue("Value", XmlConvert.ToString(value, XmlDateTimeSerializationMode.Utc)); + context.Element(GetPrefix(field, part)).SetAttributeValue("Value", XmlConvert.ToString(field.Storage.Get(null), XmlDateTimeSerializationMode.Utc)); } protected override void Describe(DescribeMembersContext context) { diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/EnumerationFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/EnumerationFieldDriver.cs index d452fd673..fb9e64649 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/EnumerationFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/EnumerationFieldDriver.cs @@ -63,8 +63,7 @@ namespace Orchard.Fields.Drivers { } protected override void Exporting(ContentPart part, EnumerationField field, ExportContentContext context) { - if (!String.IsNullOrEmpty(field.Value)) - context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Value", field.Value); + context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Value", field.Value); } protected override void Describe(DescribeMembersContext context) { diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/InputFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/InputFieldDriver.cs index d835b43fe..babe5debf 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/InputFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/InputFieldDriver.cs @@ -61,8 +61,7 @@ namespace Orchard.Fields.Drivers { } protected override void Exporting(ContentPart part, InputField field, ExportContentContext context) { - if (!String.IsNullOrEmpty(field.Value)) - context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Value", field.Value); + context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Value", field.Value); } protected override void Describe(DescribeMembersContext context) { diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/LinkFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/LinkFieldDriver.cs index 8b1a86d2e..3f314311c 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/LinkFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/LinkFieldDriver.cs @@ -75,11 +75,9 @@ namespace Orchard.Fields.Drivers { } protected override void Exporting(ContentPart part, LinkField field, ExportContentContext context) { - if (!String.IsNullOrEmpty(field.Text) || !String.IsNullOrEmpty(field.Value) || !String.IsNullOrEmpty(field.Target)) { - context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Text", field.Text); - context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Url", field.Value); - context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Target", field.Target); - } + context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Text", field.Text); + context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Url", field.Value); + context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Target", field.Target); } protected override void Describe(DescribeMembersContext context) { diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs index a1dfd46bc..493b40d97 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs @@ -106,8 +106,7 @@ namespace Orchard.Fields.Drivers { } protected override void Exporting(ContentPart part, NumericField field, ExportContentContext context) { - if (field.Value.HasValue) - context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Value", field.Value.Value.ToString(CultureInfo.InvariantCulture)); + context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Value", !field.Value.HasValue ? String.Empty : field.Value.Value.ToString(CultureInfo.InvariantCulture)); } protected override void Describe(DescribeMembersContext context) { diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs index b498d6431..4bb4940d5 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs @@ -117,13 +117,10 @@ namespace Orchard.Taxonomies.Drivers { } protected override void Exporting(ContentPart part, TaxonomyField field, ExportContentContext context) { - var appliedTerms = _taxonomyService.GetTermsForContentItem(part.ContentItem.Id, field.Name); - + var appliedTerms = _taxonomyService.GetTermsForContentItem(part.ContentItem.Id, field.Name); // stores all content items associated to this field var termIdentities = appliedTerms.Select(x => Services.ContentManager.GetItemMetadata(x).Identity.ToString()).ToArray(); - - if (termIdentities.Any()) - context.Element(XmlConvert.EncodeLocalName(field.FieldDefinition.Name + "." + field.Name)).SetAttributeValue("Terms", String.Join(",", termIdentities)); + context.Element(XmlConvert.EncodeLocalName(field.FieldDefinition.Name + "." + field.Name)).SetAttributeValue("Terms", String.Join(",", termIdentities)); } protected override void Importing(ContentPart part, TaxonomyField field, ImportContentContext context) {