Application as a super theme also for pure mvc views (#8043)

OrchardCMS · Dec 17, 2020 · 877886c · 877886c
1 parent aa102c4
commit 877886c
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/...dCore/OrchardCore.DisplayManagement/LocationExpander/ThemeViewLocationExpanderProvider.cs b/...dCore/OrchardCore.DisplayManagement/LocationExpander/ThemeViewLocationExpanderProvider.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.Extensions.Hosting;
 using OrchardCore.DisplayManagement.Extensions;
 using OrchardCore.DisplayManagement.Razor;
 using OrchardCore.Environment.Extensions;
@@ -11,10 +12,12 @@ namespace OrchardCore.DisplayManagement.LocationExpander
 {
     public class ThemeViewLocationExpanderProvider : IViewLocationExpanderProvider
     {
+        private readonly IHostEnvironment _hostingEnvironment;
         private readonly IExtensionManager _extensionManager;
 
-        public ThemeViewLocationExpanderProvider(IExtensionManager extensionManager)
+        public ThemeViewLocationExpanderProvider(IHostEnvironment hostingEnvironment, IExtensionManager extensionManager)
         {
+            _hostingEnvironment = hostingEnvironment;
             _extensionManager = extensionManager;
         }
 
@@ -45,7 +48,18 @@ public virtual IEnumerable<string> ExpandViewLocations(ViewLocationExpanderConte
             var currentThemeAndBaseThemesOrdered = _extensionManager
                 .GetFeatures(new[] { currentThemeId })
                 .Where(x => x.Extension.IsTheme())
-                .Reverse();
+                .Reverse()
+                .ToList();
+
+            // let the application acting as a super theme also for mvc views discovering.
+            var applicationTheme = _extensionManager
+                .GetFeatures()
+                .FirstOrDefault(x => x.Id == _hostingEnvironment.ApplicationName);
+
+            if (applicationTheme != null)
+            {
+                currentThemeAndBaseThemesOrdered.Insert(0, applicationTheme);
+            }
 
             var result = new List<string>();