From 3f6a5a465aeed915546d8ab93a3b29a481b08630 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 26 Feb 2013 16:03:29 +0100 Subject: [PATCH 01/11] [IMP] Clean signup show/hide. Add 'reset' state bzr revid: fme@openerp.com-20130226150329-uny1inbelywkxu35 --- .../auth_signup/static/src/js/auth_signup.js | 41 +++++++++++-------- .../static/src/xml/auth_signup.xml | 25 ++++++----- 2 files changed, 38 insertions(+), 28 deletions(-) diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js index 6757b9cb69d..0b11f3ea446 100644 --- a/addons/auth_signup/static/src/js/auth_signup.js +++ b/addons/auth_signup/static/src/js/auth_signup.js @@ -3,28 +3,39 @@ openerp.auth_signup = function(instance) { var _t = instance.web._t; instance.web.Login.include({ + init: function() { + this._super.apply(this, arguments); + this.on('change:login-mode', this, function() { + /* + * Switches the login box to the select mode + * whith mode == [default|signup|reset] + */ + var self = this; + var mode = this.get('login-mode') || 'default'; + self.$('*[data-modes]').each(function() { + var modes = $(this).data('modes').split(/\s+/); + $(this).toggle(modes.indexOf(mode) > -1); + }); + }); + }, start: function() { var self = this; + this.set({ 'login-mode': 'default' }); var d = this._super(); d.done(function() { - self.$(".oe_signup_show").hide(); // to switch between the signup and regular login form self.$('a.oe_signup_signup').click(function(ev) { if (ev) { ev.preventDefault(); } - self.$el.addClass("oe_login_signup"); - self.$(".oe_signup_show").show(); - self.$(".oe_signup_hide").hide(); + self.set({ 'login-mode': 'signup' }); return false; }); self.$('a.oe_signup_back').click(function(ev) { if (ev) { ev.preventDefault(); } - self.$el.removeClass("oe_login_signup"); - self.$(".oe_signup_show").hide(); - self.$(".oe_signup_hide").show(); + self.set({ 'login-mode': 'default' }); delete self.params.token; return false; }); @@ -51,22 +62,18 @@ openerp.auth_signup = function(instance) { // bind reset password link self.$('a.oe_signup_reset_password').click(self.do_reset_password); - // make signup link and reset password link visible only when enabled - self.$('a.oe_signup_signup').hide(); - self.$('a.oe_signup_reset_password').hide(); if (dbname) { self.rpc("/auth_signup/get_config", {dbname: dbname}) .done(function(result) { if (result.signup) { - self.$('a.oe_signup_signup').show(); + self.set({ 'login-mode': 'signup' }); } if (result.reset_password) { - self.$('a.oe_signup_reset_password').show(); + self.set({ 'login-mode': 'reset' }); } }); } }); - return d; }, @@ -76,9 +83,7 @@ openerp.auth_signup = function(instance) { this.on_db_loaded([result.db]); if (result.token) { // switch to signup mode, set user name and login - this.$el.addClass("oe_login_signup"); - self.$(".oe_signup_show").show(); - self.$(".oe_signup_hide").hide(); + this.set({ 'login-mode': 'signup' }); this.$("form input[name=name]").val(result.name).attr("readonly", "readonly"); if (result.login) { this.$("form input[name=login]").val(result.login).attr("readonly", "readonly"); @@ -88,6 +93,7 @@ openerp.auth_signup = function(instance) { } else { // remain in login mode, set login if present delete this.params.token; + this.set({ 'login-mode': 'default' }); this.$("form input[name=login]").val(result.login || ""); } }, @@ -105,7 +111,8 @@ openerp.auth_signup = function(instance) { if (ev) { ev.preventDefault(); } - if (this.$el.hasClass("oe_login_signup")) { + var login_mode = this.get('login-mode'); + if (login_mode === 'signup' || login_mode === 'reset') { // signup user (or reset password) var db = this.$("form [name=db]").val(); var name = this.$("form input[name=name]").val(); diff --git a/addons/auth_signup/static/src/xml/auth_signup.xml b/addons/auth_signup/static/src/xml/auth_signup.xml index d1c04cb6807..5b4e246b448 100644 --- a/addons/auth_signup/static/src/xml/auth_signup.xml +++ b/addons/auth_signup/static/src/xml/auth_signup.xml @@ -5,24 +5,27 @@ - - +
  • Name
    • +
    • - - +
  • Username
    • +
  • Username (Email)
    •  - - +
  • Confirm Password
    • +
  • - - - - - + + + +
    • From ce688b93e426c6f2edb0ad87181d0e937439b243 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 26 Feb 2013 16:16:22 +0100 Subject: [PATCH 02/11] [IMP] Code lint bzr revid: fme@openerp.com-20130226151622-frhyc73lwtc56tee --- addons/auth_signup/static/src/js/auth_signup.js | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js index 0b11f3ea446..4cff913253e 100644 --- a/addons/auth_signup/static/src/js/auth_signup.js +++ b/addons/auth_signup/static/src/js/auth_signup.js @@ -21,20 +21,13 @@ openerp.auth_signup = function(instance) { start: function() { var self = this; this.set({ 'login-mode': 'default' }); - var d = this._super(); - d.done(function() { + return this._super().then(function() { // to switch between the signup and regular login form self.$('a.oe_signup_signup').click(function(ev) { - if (ev) { - ev.preventDefault(); - } self.set({ 'login-mode': 'signup' }); return false; }); self.$('a.oe_signup_back').click(function(ev) { - if (ev) { - ev.preventDefault(); - } self.set({ 'login-mode': 'default' }); delete self.params.token; return false; @@ -53,7 +46,7 @@ openerp.auth_signup = function(instance) { if (dbname && self.params.token) { self.rpc("/auth_signup/retrieve", {dbname: dbname, token: self.params.token}) .done(self.on_token_loaded) - .fail(self.on_token_failed) + .fail(self.on_token_failed); } if (dbname && self.params.login) { self.$("form input[name=login]").val(self.params.login); @@ -74,7 +67,6 @@ openerp.auth_signup = function(instance) { }); } }); - return d; }, on_token_loaded: function(result) { @@ -169,7 +161,7 @@ openerp.auth_signup = function(instance) { this.do_warn(_t("Login"), _t("No database selected !")); return false; } else if (!login) { - this.do_warn(_t("Login"), _t("Please enter a username or email address.")) + this.do_warn(_t("Login"), _t("Please enter a username or email address.")); return false; } var params = { From ed5012ffb6ef0888893e4623da8ee45230f4a4b9 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 26 Feb 2013 17:03:33 +0100 Subject: [PATCH 03/11] [FIX] ... my own error bzr revid: fme@openerp.com-20130226160333-nxshvoq8ydf4gfcp --- .../auth_signup/static/src/js/auth_signup.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js index 4cff913253e..d292febcc87 100644 --- a/addons/auth_signup/static/src/js/auth_signup.js +++ b/addons/auth_signup/static/src/js/auth_signup.js @@ -5,6 +5,8 @@ openerp.auth_signup = function(instance) { instance.web.Login.include({ init: function() { this._super.apply(this, arguments); + this.signup_enabled = false; + this.reset_password_enabled = false; this.on('change:login-mode', this, function() { /* * Switches the login box to the select mode @@ -16,6 +18,8 @@ openerp.auth_signup = function(instance) { var modes = $(this).data('modes').split(/\s+/); $(this).toggle(modes.indexOf(mode) > -1); }); + self.$('a.oe_signup_signup:visible').toggle(this.signup_enabled); + self.$('a.oe_signup_reset_password:visible').toggle(this.reset_password_enabled); }); }, start: function() { @@ -56,15 +60,10 @@ openerp.auth_signup = function(instance) { self.$('a.oe_signup_reset_password').click(self.do_reset_password); if (dbname) { - self.rpc("/auth_signup/get_config", {dbname: dbname}) - .done(function(result) { - if (result.signup) { - self.set({ 'login-mode': 'signup' }); - } - if (result.reset_password) { - self.set({ 'login-mode': 'reset' }); - } - }); + self.rpc("/auth_signup/get_config", {dbname: dbname}).done(function(result) { + self.signup_enabled = result.signup; + self.reset_password_enabled = result.reset_password; + }); } }); }, @@ -97,6 +96,7 @@ openerp.auth_signup = function(instance) { this.show_error(_t("Invalid signup token")); delete this.params.db; delete this.params.token; + this.set({ 'login-mode': 'default' }); }, on_submit: function(ev) { From 977eaed2c852bbe9aa6c60cc8a36861f4967ae7d Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 26 Feb 2013 17:19:25 +0100 Subject: [PATCH 04/11] [FIX] make a json request out of reset_password bzr revid: fme@openerp.com-20130226161925-v8sr2r1zgcki6n3z --- addons/auth_signup/controllers/main.py | 11 +++------- .../auth_signup/static/src/js/auth_signup.js | 20 ++++++++++--------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py index baf1a8f0b28..73e2f0e3fa0 100644 --- a/addons/auth_signup/controllers/main.py +++ b/addons/auth_signup/controllers/main.py @@ -19,9 +19,6 @@ # ############################################################################## import logging -import urllib - -import werkzeug import openerp from openerp.modules.registry import RegistryManager @@ -69,7 +66,7 @@ class Controller(openerp.addons.web.http.Controller): res_users = registry.get('res.users') res_users.signup(cr, openerp.SUPERUSER_ID, values, token) - @openerp.addons.web.http.httprequest + @openerp.addons.web.http.jsonrequest def reset_password(self, req, dbname, login): """ retrieve user, and perform reset password """ registry = RegistryManager.get(dbname) @@ -78,12 +75,10 @@ class Controller(openerp.addons.web.http.Controller): res_users = registry.get('res.users') res_users.reset_password(cr, openerp.SUPERUSER_ID, login) cr.commit() - message = 'An email has been sent with credentials to reset your password' except Exception as e: # signup error _logger.exception('error when resetting password') - message = e.message - params = [('action', 'login'), ('error_message', message)] - return werkzeug.utils.redirect("/#" + urllib.urlencode(params)) + raise(e) + return True # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js index d292febcc87..4303ea5b6cf 100644 --- a/addons/auth_signup/static/src/js/auth_signup.js +++ b/addons/auth_signup/static/src/js/auth_signup.js @@ -74,7 +74,7 @@ openerp.auth_signup = function(instance) { this.on_db_loaded([result.db]); if (result.token) { // switch to signup mode, set user name and login - this.set({ 'login-mode': 'signup' }); + this.set({ 'login-mode': this.params.type === 'reset' ? 'reset' : 'signup' }); this.$("form input[name=name]").val(result.name).attr("readonly", "readonly"); if (result.login) { this.$("form input[name=login]").val(result.login).attr("readonly", "readonly"); @@ -155,21 +155,23 @@ openerp.auth_signup = function(instance) { if (ev) { ev.preventDefault(); } + var self = this; var db = this.$("form [name=db]").val(); var login = this.$("form input[name=login]").val(); if (!db) { this.do_warn(_t("Login"), _t("No database selected !")); - return false; + return $.Deferred.reject(); } else if (!login) { this.do_warn(_t("Login"), _t("Please enter a username or email address.")); - return false; + return $.Deferred.reject(); } - var params = { - dbname : db, - login: login, - }; - var url = "/auth_signup/reset_password?" + $.param(params); - window.location = url; + return self.rpc("/auth_signup/reset_password", { dbname: db, login: login }).done(function(result) { + self.show_error(_t("An email has been sent with credentials to reset your password")); + self.set({ 'login-mode': 'default' }); + }).fail(function(result, ev) { + ev.preventDefault(); + self.show_error(result.message); + }); }, }); }; From ab4e67a786c733bfa9d1c923bcfc8e4b17b70dc6 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 26 Feb 2013 17:39:20 +0100 Subject: [PATCH 05/11] [FIX] set login-mode on time bzr revid: fme@openerp.com-20130226163920-7m4ye86xv1c06owo --- addons/auth_signup/static/src/js/auth_signup.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js index 4303ea5b6cf..0ce7f04e590 100644 --- a/addons/auth_signup/static/src/js/auth_signup.js +++ b/addons/auth_signup/static/src/js/auth_signup.js @@ -24,7 +24,6 @@ openerp.auth_signup = function(instance) { }, start: function() { var self = this; - this.set({ 'login-mode': 'default' }); return this._super().then(function() { // to switch between the signup and regular login form self.$('a.oe_signup_signup').click(function(ev) { @@ -63,7 +62,11 @@ openerp.auth_signup = function(instance) { self.rpc("/auth_signup/get_config", {dbname: dbname}).done(function(result) { self.signup_enabled = result.signup; self.reset_password_enabled = result.reset_password; + self.set({ 'login-mode': 'default' }); }); + } else { + // TODO: support multiple database mode + this.set({ 'login-mode': 'default' }); } }); }, From 790262cbe4a23ec012932913aaf16c3ba0ee1475 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 26 Feb 2013 17:39:41 +0100 Subject: [PATCH 06/11] [FIX] Bad usage of deferreds bzr revid: fme@openerp.com-20130226163941-fky6s1zwrvavf8f6 --- addons/auth_signup/static/src/js/auth_signup.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js index 0ce7f04e590..82e0806ab14 100644 --- a/addons/auth_signup/static/src/js/auth_signup.js +++ b/addons/auth_signup/static/src/js/auth_signup.js @@ -163,10 +163,10 @@ openerp.auth_signup = function(instance) { var login = this.$("form input[name=login]").val(); if (!db) { this.do_warn(_t("Login"), _t("No database selected !")); - return $.Deferred.reject(); + return $.Deferred().reject(); } else if (!login) { this.do_warn(_t("Login"), _t("Please enter a username or email address.")); - return $.Deferred.reject(); + return $.Deferred().reject(); } return self.rpc("/auth_signup/reset_password", { dbname: db, login: login }).done(function(result) { self.show_error(_t("An email has been sent with credentials to reset your password")); From 4c3d4f36a425228297e690a657af475307b7c027 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 26 Feb 2013 17:55:22 +0100 Subject: [PATCH 07/11] [IMP] Hide "manage database" link when login mode is not default bzr revid: fme@openerp.com-20130226165522-930dndel17no11m1 --- addons/auth_signup/static/src/xml/auth_signup.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/auth_signup/static/src/xml/auth_signup.xml b/addons/auth_signup/static/src/xml/auth_signup.xml index 5b4e246b448..9ef4f394e27 100644 --- a/addons/auth_signup/static/src/xml/auth_signup.xml +++ b/addons/auth_signup/static/src/xml/auth_signup.xml @@ -28,6 +28,9 @@ + + this.attr('data-modes', 'default'); + From fe20d5197711fe6f997b9cefa7a6349be3d01270 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 26 Feb 2013 18:14:13 +0100 Subject: [PATCH 08/11] [IMP] use new api for events bzr revid: fme@openerp.com-20130226171413-1h3lyhm79gw3c3rv --- addons/auth_signup/static/src/js/auth_signup.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js index 82e0806ab14..78c62749d8a 100644 --- a/addons/auth_signup/static/src/js/auth_signup.js +++ b/addons/auth_signup/static/src/js/auth_signup.js @@ -27,11 +27,11 @@ openerp.auth_signup = function(instance) { return this._super().then(function() { // to switch between the signup and regular login form self.$('a.oe_signup_signup').click(function(ev) { - self.set({ 'login-mode': 'signup' }); + self.set('login-mode', 'signup'); return false; }); self.$('a.oe_signup_back').click(function(ev) { - self.set({ 'login-mode': 'default' }); + self.set('login-mode', 'default'); delete self.params.token; return false; }); @@ -62,11 +62,11 @@ openerp.auth_signup = function(instance) { self.rpc("/auth_signup/get_config", {dbname: dbname}).done(function(result) { self.signup_enabled = result.signup; self.reset_password_enabled = result.reset_password; - self.set({ 'login-mode': 'default' }); + self.set('login-mode', 'default'); }); } else { // TODO: support multiple database mode - this.set({ 'login-mode': 'default' }); + this.set('login-mode', 'default'); } }); }, @@ -77,7 +77,7 @@ openerp.auth_signup = function(instance) { this.on_db_loaded([result.db]); if (result.token) { // switch to signup mode, set user name and login - this.set({ 'login-mode': this.params.type === 'reset' ? 'reset' : 'signup' }); + this.set('login-mode', (this.params.type === 'reset' ? 'reset' : 'signup')); this.$("form input[name=name]").val(result.name).attr("readonly", "readonly"); if (result.login) { this.$("form input[name=login]").val(result.login).attr("readonly", "readonly"); @@ -87,7 +87,7 @@ openerp.auth_signup = function(instance) { } else { // remain in login mode, set login if present delete this.params.token; - this.set({ 'login-mode': 'default' }); + this.set('login-mode', 'default'); this.$("form input[name=login]").val(result.login || ""); } }, @@ -99,7 +99,7 @@ openerp.auth_signup = function(instance) { this.show_error(_t("Invalid signup token")); delete this.params.db; delete this.params.token; - this.set({ 'login-mode': 'default' }); + this.set('login-mode', 'default'); }, on_submit: function(ev) { @@ -170,7 +170,7 @@ openerp.auth_signup = function(instance) { } return self.rpc("/auth_signup/reset_password", { dbname: db, login: login }).done(function(result) { self.show_error(_t("An email has been sent with credentials to reset your password")); - self.set({ 'login-mode': 'default' }); + self.set('login-mode', 'default'); }).fail(function(result, ev) { ev.preventDefault(); self.show_error(result.message); From 0ba8ca07a5c13440cbf9cd7f18243e47fc97ebc5 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 26 Feb 2013 21:57:45 +0100 Subject: [PATCH 09/11] [FIX] s/this/self/ bzr revid: fme@openerp.com-20130226205745-h48pyc1qdkjj2uie --- addons/auth_signup/static/src/js/auth_signup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js index 78c62749d8a..72ab85ada32 100644 --- a/addons/auth_signup/static/src/js/auth_signup.js +++ b/addons/auth_signup/static/src/js/auth_signup.js @@ -66,7 +66,7 @@ openerp.auth_signup = function(instance) { }); } else { // TODO: support multiple database mode - this.set('login-mode', 'default'); + self.set('login-mode', 'default'); } }); }, From 4491d763c7f70cdaf39f5f611b3bce57d7e07618 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 28 Feb 2013 17:39:55 +0100 Subject: [PATCH 10/11] [IMP] Renamed getter login-mode to login_mode. Put event in start() bzr revid: fme@openerp.com-20130228163955-bqx2ezyw71fua862 --- .../auth_signup/static/src/js/auth_signup.js | 44 +++++++++---------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js index 72ab85ada32..f8c493a572b 100644 --- a/addons/auth_signup/static/src/js/auth_signup.js +++ b/addons/auth_signup/static/src/js/auth_signup.js @@ -7,31 +7,29 @@ openerp.auth_signup = function(instance) { this._super.apply(this, arguments); this.signup_enabled = false; this.reset_password_enabled = false; - this.on('change:login-mode', this, function() { - /* - * Switches the login box to the select mode - * whith mode == [default|signup|reset] - */ - var self = this; - var mode = this.get('login-mode') || 'default'; - self.$('*[data-modes]').each(function() { - var modes = $(this).data('modes').split(/\s+/); - $(this).toggle(modes.indexOf(mode) > -1); - }); - self.$('a.oe_signup_signup:visible').toggle(this.signup_enabled); - self.$('a.oe_signup_reset_password:visible').toggle(this.reset_password_enabled); - }); }, start: function() { var self = this; return this._super().then(function() { + + // Switches the login box to the select mode whith mode == [default|signup|reset] + self.on('change:login_mode', self, function() { + var mode = self.get('login_mode') || 'default'; + self.$('*[data-modes]').each(function() { + var modes = $(this).data('modes').split(/\s+/); + $(this).toggle(modes.indexOf(mode) > -1); + }); + self.$('a.oe_signup_signup:visible').toggle(self.signup_enabled); + self.$('a.oe_signup_reset_password:visible').toggle(self.reset_password_enabled); + }); + // to switch between the signup and regular login form self.$('a.oe_signup_signup').click(function(ev) { - self.set('login-mode', 'signup'); + self.set('login_mode', 'signup'); return false; }); self.$('a.oe_signup_back').click(function(ev) { - self.set('login-mode', 'default'); + self.set('login_mode', 'default'); delete self.params.token; return false; }); @@ -62,11 +60,11 @@ openerp.auth_signup = function(instance) { self.rpc("/auth_signup/get_config", {dbname: dbname}).done(function(result) { self.signup_enabled = result.signup; self.reset_password_enabled = result.reset_password; - self.set('login-mode', 'default'); + self.set('login_mode', 'default'); }); } else { // TODO: support multiple database mode - self.set('login-mode', 'default'); + self.set('login_mode', 'default'); } }); }, @@ -77,7 +75,7 @@ openerp.auth_signup = function(instance) { this.on_db_loaded([result.db]); if (result.token) { // switch to signup mode, set user name and login - this.set('login-mode', (this.params.type === 'reset' ? 'reset' : 'signup')); + this.set('login_mode', (this.params.type === 'reset' ? 'reset' : 'signup')); this.$("form input[name=name]").val(result.name).attr("readonly", "readonly"); if (result.login) { this.$("form input[name=login]").val(result.login).attr("readonly", "readonly"); @@ -87,7 +85,7 @@ openerp.auth_signup = function(instance) { } else { // remain in login mode, set login if present delete this.params.token; - this.set('login-mode', 'default'); + this.set('login_mode', 'default'); this.$("form input[name=login]").val(result.login || ""); } }, @@ -99,14 +97,14 @@ openerp.auth_signup = function(instance) { this.show_error(_t("Invalid signup token")); delete this.params.db; delete this.params.token; - this.set('login-mode', 'default'); + this.set('login_mode', 'default'); }, on_submit: function(ev) { if (ev) { ev.preventDefault(); } - var login_mode = this.get('login-mode'); + var login_mode = this.get('login_mode'); if (login_mode === 'signup' || login_mode === 'reset') { // signup user (or reset password) var db = this.$("form [name=db]").val(); @@ -170,7 +168,7 @@ openerp.auth_signup = function(instance) { } return self.rpc("/auth_signup/reset_password", { dbname: db, login: login }).done(function(result) { self.show_error(_t("An email has been sent with credentials to reset your password")); - self.set('login-mode', 'default'); + self.set('login_mode', 'default'); }).fail(function(result, ev) { ev.preventDefault(); self.show_error(result.message); From f3d48483f4dc33fd87abd21b0c8816135fb986b8 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 28 Feb 2013 17:44:17 +0100 Subject: [PATCH 11/11] [IMP] init() not need anymore bzr revid: fme@openerp.com-20130228164417-19xclqx1u9t6krg1 --- addons/auth_signup/static/src/js/auth_signup.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js index f8c493a572b..69a4cc35b52 100644 --- a/addons/auth_signup/static/src/js/auth_signup.js +++ b/addons/auth_signup/static/src/js/auth_signup.js @@ -3,13 +3,10 @@ openerp.auth_signup = function(instance) { var _t = instance.web._t; instance.web.Login.include({ - init: function() { - this._super.apply(this, arguments); - this.signup_enabled = false; - this.reset_password_enabled = false; - }, start: function() { var self = this; + this.signup_enabled = false; + this.reset_password_enabled = false; return this._super().then(function() { // Switches the login box to the select mode whith mode == [default|signup|reset]