Merge branch 'develop' into develop-v11

umbraco · Oct 27, 2022 · c9b3845 · c9b3845
2 parents 0ea2681 + def3fef
commit c9b3845
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/Umbraco.Docs.Samples.Web/Controllers/DefaultController.cs b/Umbraco.Docs.Samples.Web/Controllers/DefaultController.cs
@@ -0,0 +1,23 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.Extensions.Logging;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Web;
+using Umbraco.Cms.Web.Common.Controllers;
+
+namespace Umbraco.Docs.Samples.Web.Controllers
+{
+    public class DefaultController : RenderController
+    {
+        public DefaultController(ILogger<RenderController> logger, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor) : base(logger, compositeViewEngine, umbracoContextAccessor)
+        {
+        }
+
+        [ResponseCache(NoStore = true, Location = ResponseCacheLocation.None)]
+        public override IActionResult Index()
+        {
+            return CurrentTemplate(new ContentModel(CurrentPage));
+        }
+
+    }
+}
diff --git a/Umbraco.Docs.Samples.Web/Notifications/SendingAllowedChildrenNotificationHandler.cs b/Umbraco.Docs.Samples.Web/Notifications/SendingAllowedChildrenNotificationHandler.cs
@@ -6,6 +6,7 @@
 
 namespace Umbraco.Docs.Samples.Web.Notifications
 {
+    // https://our.umbraco.com/documentation/Reference/Notifications/SendingAllowedChildrenNotification/
     internal class SendingAllowedChildrenNotificationHandler : INotificationHandler<SendingAllowedChildrenNotification>
     {
         public void Handle(SendingAllowedChildrenNotification notification)

diff --git a/Umbraco.Docs.Samples.Web/Startup.cs b/Umbraco.Docs.Samples.Web/Startup.cs
@@ -10,6 +10,8 @@
 using Umbraco.Docs.Samples.Web.RecurringHostedService;
 using Umbraco.Docs.Samples.Web.Stylesheets_Javascript;
 using Umbraco.Docs.Samples.Web.Tutorials;
+using Umbraco.Cms.Web.Website.Controllers;
+using Umbraco.Docs.Samples.Web.Controllers;
 
 namespace Umbraco.Docs.Samples.Web
 {
@@ -55,6 +57,11 @@ public void ConfigureServices(IServiceCollection services)
                 .AddTutorials()
                 .Build();
 #pragma warning restore IDE0022 // Use expression body for methods
+
+            services.Configure<UmbracoRenderingDefaultsOptions>(c =>
+            {
+                c.DefaultControllerType = typeof(DefaultController);
+            });
         }
 
         /// <summary>