odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Fix reset password token issue 

bzr revid: vta@openerp.com-20121231150239-oeuvnwbpsvyzh5v5
This commit is contained in:
vta vta@openerp.com 2012-12-31 16:02:39 +01:00
parent ad7c08b2c4
commit a9e53f724f
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/auth_signup/res_users.py
View File

@ -256,7 +256,6 @@ class res_users(osv.Model):
raise osv.except_osv(_("Cannot send email: no outgoing email server configured.\nYou can configure it under Settings/General Settings."), user.name)
else:
raise osv.except_osv(_("Mail sent to:"), user.email)
return True
def create(self, cr, uid, values, context=None):
@ -264,5 +263,7 @@ class res_users(osv.Model):
user_id = super(res_users, self).create(cr, uid, values, context=context)
user = self.browse(cr, uid, user_id, context=context)
if context and context.get('reset_password') and user.email:
user.action_reset_password()
return user_id
try:
user.action_reset_password()
finally:
return user_id

1
addons/auth_signup/static/src/js/auth_signup.js
View File

@ -144,6 +144,7 @@ openerp.auth_signup = function(instance) {
self.show_error(result.error);
} else {
super_.apply(self, [ev]);
window.location = "/#action=login";
}
});
} else {

5
addons/portal_anonymous/static/src/js/portal_anonymous.js
View File

@ -44,9 +44,8 @@ openerp.portal_anonymous = function(instance) {
start: function() {
var self = this;
return $.when(this._super()).then(function() {
var params = $.deparam($.param.querystring());
var dblist = self.db_list || [];
if (!self.session.session_is_valid() && dblist.length === 1 && (!params.token || !params.login)) {
if (!self.session.session_is_valid() && dblist.length === 1 && _.isEmpty(self.params)) {
self.remember_credentials = false;
// XXX get login/pass from server (via a rpc call) ?
return self.do_login(dblist[0], 'anonymous', 'anonymous');
@ -93,7 +92,7 @@ openerp.portal_anonymous = function(instance) {
},
// Avoid browser preloading
show_application: function() {
var params = $.deparam($.param.querystring());
var params = $.deparam($.param.fragment());
if (!!params.token || !!params.login) {
return this.show_login();
}