Added a story asset type for link builder expressions

mgesing · mgesing · commit e85d9028a031 · 2019-04-26T14:16:06.000+02:00
diff --git a/src/Libraries/SmartStore.Services/Cms/Blocks/StoryAssetAttribute.cs b/src/Libraries/SmartStore.Services/Cms/Blocks/StoryAssetAttribute.cs
@@ -45,6 +45,11 @@ public enum StoryAssetKind
         /// <summary>
         /// The property value is a manufacturer identifier.
         /// </summary>
-        Manufacturer
+        Manufacturer,
+
+        /// <summary>
+        /// The property value is a link builder expression.
+        /// </summary>
+        Link
     }
 }
diff --git a/src/Libraries/SmartStore.Services/Cms/LinkResolverResult.cs b/src/Libraries/SmartStore.Services/Cms/LinkResolverResult.cs
@@ -70,6 +70,31 @@ public string Link
             }
         }
 
+        /// <summary>
+        /// Creates the full link expression including type, value and query string.
+        /// </summary>
+        /// <param name="includeQueryString">Whether to include the query string.</param>
+        /// <returns>Link expression.</returns>
+        public string GetExpression(bool includeQueryString = true)
+        {
+            if (Value == null)
+            {
+                return string.Empty;
+            }
+
+            var result = Type == LinkType.Url
+                ? Value.ToString()
+                : string.Concat(Type.ToString().ToLower(), ":", Value.ToString());
+
+            if (includeQueryString && Type != LinkType.Url && !string.IsNullOrWhiteSpace(QueryString))
+            {
+                return string.Concat(result, "?", QueryString);
+            }
+
+            return result;
+        }
+
+
         public override string ToString()
 		{
 			return this.Link;

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,11 @@ public enum StoryAssetKind`
`45`	`45`	`/// <summary>`
`46`	`46`	`/// The property value is a manufacturer identifier.`
`47`	`47`	`/// </summary>`
`48`		`- Manufacturer`
	`48`	`+ Manufacturer,`
	`49`	`+`
	`50`	`+ /// <summary>`
	`51`	`+ /// The property value is a link builder expression.`
	`52`	`+ /// </summary>`
	`53`	`+ Link`
`49`	`54`	`}`
`50`	`55`	`}`