v8: Fix for login screen title display (#7412)

umbraco · May 26, 2020 · c3c98e2 · c3c98e2
1 parent f33b4b7
commit c3c98e2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
@@ -209,6 +209,7 @@
             }
 
             if (vm.loginForm.$invalid) {
+                SetTitle();
                 return;
             }
 
@@ -257,6 +258,7 @@
                     vm.loginForm.password.$setValidity('auth', true);
                 }
             });
+            SetTitle();
         }
 
         function requestPasswordResetSubmit(email) {

diff --git a/src/Umbraco.Web.UI.Client/src/main.controller.js b/src/Umbraco.Web.UI.Client/src/main.controller.js
@@ -56,12 +56,14 @@ function MainController($scope, $location, appState, treeService, notificationsS
         appState.setSearchState("show", false);
     };
 
-    $scope.showLoginScreen = function(isTimedOut) {
+    $scope.showLoginScreen = function (isTimedOut) {
+        $scope.login.pageTitle = $scope.$root.locationTitle;
         $scope.login.isTimedOut = isTimedOut;
         $scope.login.show = true;
     };
 
-    $scope.hideLoginScreen = function() {
+    $scope.hideLoginScreen = function () {
+        $scope.$root.locationTitle = $scope.login.pageTitle;
         $scope.login.show = false;
     };