Fixes BlogBanner is always empty #346

Shazwazza · Jan 4, 2021 · ea338b3 · ea338b3
1 parent 94dd5fc
commit ea338b3
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/src/Articulate/Models/MasterModel.cs b/src/Articulate/Models/MasterModel.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Linq;
 using Umbraco.Core;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.PropertyEditors.ValueConverters;
 using Umbraco.Web;
 using Umbraco.Web.Models;
 
@@ -98,13 +100,13 @@ public string CustomRssFeed
 
         public string BlogLogo
         {
-            get => _blogLogo ?? (_blogLogo = RootBlogNode.GetCropUrl(propertyAlias: "blogLogo", imageCropMode: ImageCropMode.Max));
+            get => _blogLogo ?? (_blogLogo = RootBlogNode.GetArticulateCropUrl("blogLogo", Current.VariationContextAccessor?.VariationContext));
             protected set => _blogLogo = value;
         }
 
         public string BlogBanner
         {
-            get => _blogBanner ?? (_blogBanner = RootBlogNode.GetCropUrl(propertyAlias: "blogBanner", imageCropMode: ImageCropMode.Max));
+            get => _blogBanner ?? (_blogBanner = RootBlogNode.GetArticulateCropUrl("blogBanner", Current.VariationContextAccessor?.VariationContext));
             protected set => _blogBanner = value;
         }
 

diff --git a/src/Articulate/Models/PublishedContentExtensions.cs b/src/Articulate/Models/PublishedContentExtensions.cs
@@ -4,11 +4,37 @@
 using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.PropertyEditors.ValueConverters;
+using Umbraco.Web;
+using Umbraco.Web.Models;
 
 namespace Articulate.Models
 {
     public static class PublishedContentExtensions
     {
+        public static string GetArticulateCropUrl(this IPublishedContent content, string propertyAlias, VariationContext variationContext)
+        {
+            if (!content.ContentType.VariesByCulture())
+                return content.GetCropUrl(propertyAlias: propertyAlias, imageCropMode: ImageCropMode.Max);
+
+            var property = content.GetProperty(propertyAlias);
+            if (property == null)
+                return string.Empty;
+
+            var culture = property.PropertyType.VariesByCulture()
+                ? variationContext?.Culture
+                : string.Empty; // must be string empty, not null since that won't work :/ 
+
+            var url = content.MediaUrl(culture, UrlMode.Default, "blogBanner");
+            var cropUrl = content.Value<ImageCropperValue>("blogBanner", culture);
+            if (cropUrl != null)
+            {
+                return url.GetCropUrl(cropUrl, imageCropMode: ImageCropMode.Max);
+            }
+
+            return string.Empty;
+        }
+
         public static IPublishedContent Next(this IPublishedContent content)
         {
             var found = false;
@@ -92,4 +118,4 @@ public static bool HasMoreThan<TSource>(this IEnumerable<TSource> source, int co
         }
 
     }
-}
+}