diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2011-06-08 10:54:07 +0200 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2011-06-08 10:54:07 +0200 |
| commit | 6b67b72ccd0cd4b335dddcc2ea63cd416063ee64 (patch) | |
| tree | 12e65ab40695bc64cc941440cf3bb87466d31645 /addons/base | |
| parent | c08bc0b989d5d6c18937845b339894daddaaa9ab (diff) | |
[imp] added remember db & user to login
bzr revid: nicolas.vanhoren@openerp.com-20110608085407-np8f3ww3sw6rhw33
Diffstat (limited to 'addons/base')
| -rw-r--r-- | addons/base/static/src/js/chrome.js | 8 | ||||
| -rw-r--r-- | addons/base/static/src/xml/base.xml | 10 |
2 files changed, 14 insertions, 4 deletions
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index 6fa95266ba9..cdc8ff3bf40 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -776,6 +776,8 @@ openerp.base.Database = openerp.base.Controller.extend({ openerp.base.Login = openerp.base.Controller.extend({ init: function(session, element_id) { this._super(session, element_id); + this.selected_db = this.session.get_cookie('last_db_login_success') || null; + this.selected_login = this.session.get_cookie('last_login_login_success') || null; }, start: function() { var self = this; @@ -786,10 +788,10 @@ openerp.base.Login = openerp.base.Controller.extend({ self.display(); }); }, - display: function() { + display: function() { this.$element.html(QWeb.render("Login", this)); this.$element.find("form").submit(this.on_submit); - }, + }, on_login_invalid: function() { this.$element.closest(".openerp").addClass("login-mode"); }, @@ -807,6 +809,8 @@ openerp.base.Login = openerp.base.Controller.extend({ // Should hide then call callback this.session.session_login(db, login, password, function() { if(self.session.session_is_valid()) { + self.session.set_cookie('last_db_login_success', db); + self.session.set_cookie('last_login_login_success', login); self.on_login_valid(); } else { self.$element.addClass("login_invalid"); diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index afbd4f81d91..a723366ae12 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -67,7 +67,12 @@ <t t-if="db_list"> <select name="db"> <t t-foreach="db_list" t-as="db"> - <option t-att-value="db" t-att-selected="db == 'trunk'"><t t-esc="db"/></option> + <t t-if="selected_db === db"> + <option t-att-value="db" selected="true"><t t-esc="db"/></option> + </t> + <t t-if="selected_db !== db"> + <option t-att-value="db"><t t-esc="db"/></option> + </t> </t> </select> </t> @@ -75,7 +80,8 @@ </tr> <tr> <td><label for="login">User:</label></td> - <td class="oe_field_value"><input type="text" name="login" value="admin" autofocus="true"/></td> + <td class="oe_field_value"><input type="text" name="login" + t-att-value="selected_login || ''" autofocus="true"/></td> </tr> <tr> <td><label for="password">Password:</label></td> |