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

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/netcore

Browse Source
This commit is contained in:
Bjarke Berg
2020-09-23 14:29:42 +02:00
parent acc7065fa1 ca5868d52c
commit ec7db00bd2
5 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml
View File

@@ -60,7 +60,7 @@
document.angularReady = function (app) {
@await Html.AngularValueExternalLoginInfoScriptAsync(signInManager, ViewData.GetExternalSignInError())
@Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
@Html.AngularValueResetPasswordCodeInfoScript(ViewData[ViewDataExtensions.TokenPasswordResetCode])
}
</script>

2
src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
View File

@@ -110,7 +110,7 @@
<script>
document.angularReady = function(app) {
@await Html.AngularValueExternalLoginInfoScriptAsync(signInManager, ViewData.GetExternalSignInError())
@Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
@Html.AngularValueResetPasswordCodeInfoScript(ViewData[ViewDataExtensions.TokenPasswordResetCode])
@await Html.AngularValueTinyMceAssetsAsync(runtimeMinifier)
app.run(["iconHelper", function (iconHelper) {