yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further Simplification of IOptions

Browse Source
This commit is contained in:
Warren Buckley
2021-07-07 13:07:01 +01:00
parent 8d936c08da
commit b177c1ba12
3 changed files with 3 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaultsOptions.cs
View File

@@ -1,4 +1,5 @@
using System;
using Umbraco.Cms.Web.Common.Controllers;
namespace Umbraco.Cms.Web.Website.Controllers
{
@@ -10,6 +11,6 @@ namespace Umbraco.Cms.Web.Website.Controllers
/// <summary>
/// Gets the default umbraco render controller type
/// </summary>
public Type DefaultControllerType { get; set; }
public Type DefaultControllerType { get; set; } = typeof(RenderController);
}
}

28
src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaultsOptionsSetup.cs
View File

@@ -1,28 +0,0 @@
using System;
using Microsoft.Extensions.Options;
using Umbraco.Cms.Web.Common.Controllers;
namespace Umbraco.Cms.Web.Website.Controllers
{
public class UmbracoRenderingDefaultsOptionsSetup : IConfigureOptions<UmbracoRenderingDefaultsOptions>
{
//private IOptions<UmbracoRenderingDefaultsOptions> _umbracoRenderingDefaultOptions;
//public UmbracoRenderingDefaultsOptionsSetup(IOptions<UmbracoRenderingDefaultsOptions> umbracoRenderingDefaultOptions)
//{
// _umbracoRenderingDefaultOptions = umbracoRenderingDefaultOptions;
//}
public void Configure(UmbracoRenderingDefaultsOptions options)
{
if (options == null)
{
throw new ArgumentNullException(nameof(options));
}
//options.DefaultControllerType = _umbracoRenderingDefaultOptions.Value.DefaultControllerType;
options.DefaultControllerType = typeof(RenderController);
}
}
}

2
src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
View File

@@ -42,7 +42,7 @@ namespace Umbraco.Extensions
builder.Services.AddSingleton<IUmbracoRouteValuesFactory, UmbracoRouteValuesFactory>();
// Umbraco Rendering Defaults startup options to define which RenderController type to use
builder.Services.ConfigureOptions<UmbracoRenderingDefaultsOptionsSetup>();
builder.Services.ConfigureOptions<UmbracoRenderingDefaultsOptions>();
builder.Services.AddSingleton<IRoutableDocumentFilter, RoutableDocumentFilter>();