Merge branch 'v13/main'

blendinteractive · Oct 29, 2024 · a122ef4 · a122ef4
2 parents bb0d22d + 7dfe00a
commit a122ef4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/Blend.Sitemap/Assets/Views/Sitemap.cshtml b/Blend.Sitemap/Assets/Views/Sitemap.cshtml
@@ -29,8 +29,14 @@
             }
         }
         <lastmod>@item.UpdateDate</lastmod>
-        <changefreq>@item.ChangeFrequency</changefreq>
-        <priority>@item.Priority</priority>
+        @if (item.ChangeFrequency is not ChangeFrequency.omit)
+        {
+            <changefreq>@item.ChangeFrequency</changefreq>
+        }
+        @if (item.Priority is not null && item.Priority.Any())
+        {
+            <priority>@item.Priority</priority>
+        }
         @if (Model.IncludePageImages)
         {
             DisplayRelatedImages(item.ImageUrls);

diff --git a/Blend.Sitemap/SitemapBuilder.cs b/Blend.Sitemap/SitemapBuilder.cs
@@ -142,8 +142,8 @@ private SitemapPage LoadPage(IPublishedContent content, SitemapDocumentTypeOptio
 
         private SitemapPage GetPage(IPublishedContent content, SitemapDocumentTypeOptions type, string languageIsoCode)
         {
-            var priority = "1.0";
-            if (type.Priority < 10)
+            var priority = "";
+            if (type.Priority != 0 && type.Priority < 10)
                 priority = $"0.{type.Priority}";
 
             var page = new SitemapPage()

diff --git a/Blend.Sitemap/SitemapOptions.cs b/Blend.Sitemap/SitemapOptions.cs
@@ -61,14 +61,12 @@ public class SitemapDocumentTypeOptions
         /// <summary>
         /// How often the does the content in these document types change
         /// </summary>
-        [DefaultValue(ChangeFrequency.monthly)]
         [Description("How often the does the content in these document types change")]
         public ChangeFrequency ChangeFrequency { get; set; }
 
         /// <summary>
         /// What is the priority of these document types
         /// </summary>
-        [DefaultValue(5)]
         [Description("What is the priority of these document types")]
         public int Priority { get; set; }
     }
@@ -79,6 +77,7 @@ public class SitemapDocumentTypeOptions
     [Description("Options for Change Frequency")]
     public enum ChangeFrequency
     {
+        omit,
         always,
         hourly,
         daily,