IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12939 from grafana/12865-login-loading-animation

Browse Source 
animation during slow login
This commit is contained in:
Marcus Efraimsson
2018-08-27 15:17:19 +02:00
committed by GitHub
parent e1beaaa0f7 1a2ab532d1
commit e204124791
3 changed files with 52 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
public/app/core/controllers/login_ctrl.ts
View File

@@ -13,6 +13,7 @@ export class LoginCtrl {
$scope.command = {};
$scope.result = '';
$scope.loggingIn = false;
contextSrv.sidemenu = false;
@@ -105,16 +106,23 @@ export class LoginCtrl {
if (!$scope.loginForm.$valid) {
return;
}
$scope.loggingIn = true;
backendSrv.post('/login', $scope.formModel).then(function(result) {
$scope.result = result;
backendSrv
.post('/login', $scope.formModel)
.then(function(result) {
$scope.result = result;
if ($scope.formModel.password !== 'admin' || $scope.ldapEnabled || $scope.authProxyEnabled) {
$scope.toGrafana();
return;
}
$scope.changeView();
});
if ($scope.formModel.password !== 'admin' || $scope.ldapEnabled || $scope.authProxyEnabled) {
$scope.toGrafana();
return;
} else {
$scope.changeView();
}
})
.catch(() => {
$scope.loggingIn = false;
});
};
$scope.toGrafana = function() {