From 219b38ff774826a1fe111d6af89778fca0c68ae0 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 20 Nov 2018 12:33:26 +0100 Subject: [PATCH] fix authorize upgrade screen --- .../src/views/common/authorizeupgrade.controller.js | 6 ++---- src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/authorizeupgrade.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/authorizeupgrade.controller.js index 76a53929de..12803dfd51 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/authorizeupgrade.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/authorizeupgrade.controller.js @@ -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 = "/"; } - + }; } diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml index 0eba571daa..a3c7dd912c 100644 --- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml +++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml @@ -45,9 +45,7 @@ -
-
-
+