diff options
Diffstat (limited to 'web/app')
| -rw-r--r-- | web/app/view/Login.js | 4 | ||||
| -rw-r--r-- | web/app/view/LoginController.js | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/web/app/view/Login.js b/web/app/view/Login.js index 259086854..db3c55261 100644 --- a/web/app/view/Login.js +++ b/web/app/view/Login.js @@ -77,8 +77,8 @@ Ext.define('Traccar.view.Login', { inputAttrTpl: ['autocomplete="on"'] }, { xtype: 'checkboxfield', - reference: 'rememberMeField', - fieldLabel: Strings.rememberMe + reference: 'rememberField', + fieldLabel: Strings.userRemember }, { xtype: 'component', html: '<iframe id="submitTarget" name="submitTarget" style="display:none"></iframe>' diff --git a/web/app/view/LoginController.js b/web/app/view/LoginController.js index f78b1e560..7a78a6fb1 100644 --- a/web/app/view/LoginController.js +++ b/web/app/view/LoginController.js @@ -1,5 +1,5 @@ /* - * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) + * Copyright 2015 - 2016 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. @@ -27,10 +27,10 @@ Ext.define('Traccar.view.LoginController', { !Traccar.app.getServer().get('registration')); this.lookupReference('languageField').setValue(Locale.language); var user = Ext.util.Cookies.get('user'); - var pass = Ext.util.Cookies.get('pass'); - if (user && pass) { + var password = Ext.util.Cookies.get('password'); + if (user && password) { this.lookupReference('userField').setValue(user); - this.lookupReference('passwordField').setValue(pass); + this.lookupReference('passwordField').setValue(password); this.login(); } }, @@ -47,9 +47,9 @@ Ext.define('Traccar.view.LoginController', { callback: function (options, success, response) { Ext.getBody().unmask(); if (success) { - if (this.lookupReference('rememberMeField').getValue()) { + if (this.lookupReference('rememberField').getValue()) { Ext.util.Cookies.set('user', this.lookupReference('userField').getValue(), Ext.Date.add(new Date(), Ext.Date.YEAR, 1)); - Ext.util.Cookies.set('pass', this.lookupReference('passwordField').getValue(), Ext.Date.add(new Date(), Ext.Date.YEAR, 1)); + Ext.util.Cookies.set('password', this.lookupReference('passwordField').getValue(), Ext.Date.add(new Date(), Ext.Date.YEAR, 1)); } Traccar.app.setUser(Ext.decode(response.responseText)); this.fireViewEvent('login'); @@ -63,7 +63,7 @@ Ext.define('Traccar.view.LoginController', { logout: function () { Ext.util.Cookies.clear('user'); - Ext.util.Cookies.clear('pass'); + Ext.util.Cookies.clear('password'); Ext.Ajax.request({ scope: this, method: 'DELETE', |