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

fix authorize upgrade screen

Browse Source
This commit is contained in:
Mads Rasmussen
2018-11-20 12:33:26 +01:00
parent 63470c80dd
commit 219b38ff77
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/views/common/authorizeupgrade.controller.js
View File

@@ -10,9 +10,7 @@
*/
function AuthorizeUpgradeController($scope, $window) {
//Add this method to the scope - this method will be called by the login dialog controller when the login is successful
// then we'll handle the redirect.
$scope.submit = function (event) {
$scope.loginAndRedirect = function (event) {
var qry = $window.location.search.trimStart("?").split("&");
var redir = _.find(qry, function(item) {
@@ -24,7 +22,7 @@ function AuthorizeUpgradeController($scope, $window) {
else {
$window.location = "/";
}
};
}

4
src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
View File

@@ -45,9 +45,7 @@
</head>
<body id="umbracoMainPageBody" ng-controller="Umbraco.AuthorizeUpgradeController" class="login-only">
<div data-backdrop="false" class="modal hide login-overlay" aria-hidden="false" style="display: block;">
<div ng-include="'views/common/dialogs/login.html'"></div>
</div>
<umb-login on-login="loginAndRedirect()"></umb-login>
<umb-notifications></umb-notifications>