aboutsummaryrefslogtreecommitdiff
path: root/web/app
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-08-08 10:52:25 +0300
committerGitHub <noreply@github.com>2016-08-08 10:52:25 +0300
commit988ee3cc1067ef3cd63c5f5f4b4363fd9b048c84 (patch)
tree85f388c16000b33676172e512a7717c6932e3be5 /web/app
parent1f0e1dddadd32a1f40695bf33d877d192ecd1403 (diff)
parentdc78308a2cd950c6997820147dc9ee89d610923a (diff)
downloadtrackermap-server-988ee3cc1067ef3cd63c5f5f4b4363fd9b048c84.tar.gz
trackermap-server-988ee3cc1067ef3cd63c5f5f4b4363fd9b048c84.tar.bz2
trackermap-server-988ee3cc1067ef3cd63c5f5f4b4363fd9b048c84.zip
Merge pull request #2188 from ninioe/master
Automatically login remembered user
Diffstat (limited to 'web/app')
-rw-r--r--web/app/view/LoginController.js9
1 files changed, 1 insertions, 8 deletions
diff --git a/web/app/view/LoginController.js b/web/app/view/LoginController.js
index 7a78a6fb1..8beef1e04 100644
--- a/web/app/view/LoginController.js
+++ b/web/app/view/LoginController.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,13 +26,6 @@ Ext.define('Traccar.view.LoginController', {
this.lookupReference('registerButton').setDisabled(
!Traccar.app.getServer().get('registration'));
this.lookupReference('languageField').setValue(Locale.language);
- var user = Ext.util.Cookies.get('user');
- var password = Ext.util.Cookies.get('password');
- if (user && password) {
- this.lookupReference('userField').setValue(user);
- this.lookupReference('passwordField').setValue(password);
- this.login();
- }
},
login: function () {