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

Merge branch 'v9/contrib' into v9/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
This commit is contained in:
Sebastiaan Janssen
2021-11-03 13:05:43 +01:00
parent 109487f117
commit 692f952293
86 changed files with 1380 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.Common/ModelsBuilder/ModelsBuilderNotificationHandler.cs
View File

@@ -26,15 +26,17 @@ namespace Umbraco.Cms.Web.Common.ModelsBuilder
private readonly ModelsBuilderSettings _config;
private readonly IShortStringHelper _shortStringHelper;
private readonly IModelsBuilderDashboardProvider _modelsBuilderDashboardProvider;
private readonly IDefaultViewContentProvider _defaultViewContentProvider;
public ModelsBuilderNotificationHandler(
IOptions<ModelsBuilderSettings> config,
IShortStringHelper shortStringHelper,
IModelsBuilderDashboardProvider modelsBuilderDashboardProvider)
IModelsBuilderDashboardProvider modelsBuilderDashboardProvider, IDefaultViewContentProvider defaultViewContentProvider)
{
_config = config.Value;
_shortStringHelper = shortStringHelper;
_modelsBuilderDashboardProvider = modelsBuilderDashboardProvider;
_defaultViewContentProvider = defaultViewContentProvider;
}
/// <summary>
@@ -123,7 +125,7 @@ namespace Umbraco.Cms.Web.Common.ModelsBuilder
// we do not support configuring this at the moment, so just let Umbraco use its default value
// var modelNamespaceAlias = ...;
var markup = ViewHelper.GetDefaultFileContent(
var markup = _defaultViewContentProvider.GetDefaultFileContent(
modelClassName: className,
modelNamespace: modelNamespace/*,
modelNamespaceAlias: modelNamespaceAlias*/);