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

fixed so animation starts as soon as one pushes the button and animation stops if login failed

Browse Source
This commit is contained in:
Patrick O'Carroll 2018-08-23 15:31:25 +02:00
parent 8877200ef4
commit 050902a1e7
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,22 +102,27 @@ export class LoginCtrl {
$scope.login = function() {
delete $scope.loginError;
$scope.loggingIn = true;
if (!$scope.loginForm.$valid) {
return;
}
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.loggingIn = true;
$scope.toGrafana();
return;
} else {
$scope.changeView();
}
});
if ($scope.formModel.password !== 'admin' || $scope.ldapEnabled || $scope.authProxyEnabled) {
$scope.toGrafana();
return;
} else {
$scope.changeView();
}
})
.catch(() => {
$scope.loggingIn = false;
});
};
$scope.toGrafana = function() {