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

WIP

Browse Source
This commit is contained in:
Stephan
2018-07-16 14:03:41 +02:00
parent 9341278492
commit 77083f259d
6 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
View File

@@ -186,7 +186,8 @@ namespace Umbraco.Tests.Routing
/// </summary>
public class CustomDocumentController : RenderMvcController
{
public CustomDocumentController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger) : base(globalSettings, umbracoContext, databaseFactory, services, applicationCache, logger, profilingLogger)
public CustomDocumentController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger)
: base(globalSettings, umbracoContext, services, applicationCache, logger, profilingLogger)
{
}

3
src/Umbraco.Web/Editors/BackOfficeController.cs
View File

@@ -62,7 +62,8 @@ namespace Umbraco.Web.Editors
// _features = features;
//}
public BackOfficeController(ManifestParser manifestParser, UmbracoFeatures features, IGlobalSettings globalSettings, UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger) : base(globalSettings, umbracoContext, databaseFactory, services, applicationCache, logger, profilingLogger)
public BackOfficeController(ManifestParser manifestParser, UmbracoFeatures features, IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger)
: base(globalSettings, umbracoContext, services, applicationCache, logger, profilingLogger)
{
_manifestParser = manifestParser;
_features = features;

3
src/Umbraco.Web/Mvc/RenderMvcController.cs
View File

@@ -26,7 +26,8 @@ namespace Umbraco.Web.Mvc
ActionInvoker = new RenderActionInvoker();
}
public RenderMvcController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger) : base(globalSettings, umbracoContext, databaseFactory, services, applicationCache, logger, profilingLogger)
public RenderMvcController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger)
: base(globalSettings, umbracoContext, services, applicationCache, logger, profilingLogger)
{
ActionInvoker = new RenderActionInvoker();
}

9
src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
View File

@@ -18,11 +18,10 @@ namespace Umbraco.Web.Mvc
public abstract class UmbracoAuthorizedController : UmbracoController
{
protected UmbracoAuthorizedController()
{
}
{ }
protected UmbracoAuthorizedController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger) : base(globalSettings, umbracoContext, databaseFactory, services, applicationCache, logger, profilingLogger)
{
}
protected UmbracoAuthorizedController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger)
: base(globalSettings, umbracoContext, services, applicationCache, logger, profilingLogger)
{ }
}
}

10
src/Umbraco.Web/Mvc/UmbracoController.cs
View File

@@ -28,6 +28,7 @@ namespace Umbraco.Web.Mvc
// don't need to implement complex constructors + need to refactor them each time we change ours.
// this means that these properties have a setter.
// what can go wrong?
// fixme clear this comment
/// <summary>
/// Gets or sets the Umbraco context.
@@ -39,11 +40,6 @@ namespace Umbraco.Web.Mvc
/// </summary>
public virtual UmbracoContext UmbracoContext { get; set; }
/// <summary>
/// Gets or sets the database context.
/// </summary>
public IUmbracoDatabaseFactory DatabaseFactory { get; set; }
/// <summary>
/// Gets or sets the services context.
/// </summary>
@@ -86,7 +82,6 @@ namespace Umbraco.Web.Mvc
: this(
Current.Container.GetInstance<IGlobalSettings>(),
Current.Container.GetInstance<UmbracoContext>(),
Current.Container.GetInstance<IUmbracoDatabaseFactory>(),
Current.Container.GetInstance<ServiceContext>(),
Current.Container.GetInstance<CacheHelper>(),
Current.Container.GetInstance<ILogger>(),
@@ -95,11 +90,10 @@ namespace Umbraco.Web.Mvc
{
}
protected UmbracoController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger)
protected UmbracoController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger)
{
GlobalSettings = globalSettings;
UmbracoContext = umbracoContext;
DatabaseFactory = databaseFactory;
Services = services;
ApplicationCache = applicationCache;
Logger = logger;

1
src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
View File

@@ -32,6 +32,7 @@ namespace Umbraco.Web.WebApi
// don't need to implement complex constructors + need to refactor them each time we change ours.
// this means that these properties have a setter.
// what can go wrong?
// fixme remove that comment?!
/// <summary>
/// Gets or sets the Umbraco context.