summaryrefslogtreecommitdiff
path: root/addons/auth_signup/res_users.py
diff options
context:
space:
mode:
authorRaphael Collet <rco@openerp.com>2014-07-06 16:44:26 +0200
committerAntony Lesuisse <al@openerp.com>2014-07-06 17:05:41 +0200
commitcbe2dbb672a6c55d86f2e515f9d1cdfee426ef80 (patch)
treed6ff62b719fce32392397783c961b734b1e4c50e /addons/auth_signup/res_users.py
parentd78192c489d3be66cd6487b39f5ce7ba4733a187 (diff)
[MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from bzr to git was not correctly done. The git history contains irrelevant blobs and commits. This branch brings a lot of changes and fixes, too many to list exhaustively. - New orm api, objects are now used instead of ids - Environements to encapsulates cr uid context while maintaining backward compatibility - Field compute attribute is a new object oriented way to define function fields - Shared browse record cache - New onchange protocol - Optional copy flag on fields - Documentation update - Dead code cleanup - Lots of fixes
Diffstat (limited to 'addons/auth_signup/res_users.py')
-rw-r--r--addons/auth_signup/res_users.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 576a778be45..97bcea52bc1 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -104,9 +104,9 @@ class res_partner(osv.Model):
return self._get_signup_url_for_action(cr, uid, ids, context=context)
_columns = {
- 'signup_token': fields.char('Signup Token'),
- 'signup_type': fields.char('Signup Token Type'),
- 'signup_expiration': fields.datetime('Signup Expiration'),
+ 'signup_token': fields.char('Signup Token', copy=False),
+ 'signup_type': fields.char('Signup Token Type', copy=False),
+ 'signup_expiration': fields.datetime('Signup Expiration', copy=False),
'signup_valid': fields.function(_get_signup_valid, type='boolean', string='Signup Token is Valid'),
'signup_url': fields.function(_get_signup_url, type='char', string='Signup URL'),
}
@@ -302,7 +302,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 user.email and not context.get('no_reset_password'):
- context.update({'create_user': True})
+ context = dict(context, create_user=True)
try:
self.action_reset_password(cr, uid, [user.id], context=context)
except MailDeliveryException: