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

[FIX] base: fixes #1167, change password wizard (wrong default value) 

The one2many field 'user_ids' was initialized with an incorrect value for the
inverse field 'wizard_id', using a res.users id. The latter was causing a
MissingError exception. The fix is simply to not define explicitly the inverse
field in the one2many.

Also did a small cleanup of the code of the wizard.
This commit is contained in:
Raphael Collet 2014-08-06 11:20:38 +02:00
parent 52a37be447
commit 6a83425ba9
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
openerp/addons/base/res/res_users.py
View File

@ -921,29 +921,26 @@ class change_password_wizard(osv.TransientModel):
'user_ids': fields.one2many('change.password.user', 'wizard_id', string='Users'), 'user_ids': fields.one2many('change.password.user', 'wizard_id', string='Users'),
} }
def default_get(self, cr, uid, fields, context=None): def _default_user_ids(self, cr, uid, context=None):
if context == None: if context is None:
context = {} context = {}
user_ids = context.get('active_ids', []) user_model = self.pool['res.users']
wiz_id = context.get('active_id', None) user_ids = context.get('active_model') == 'res.users' and context.get('active_ids') or []
res = [] return [
users = self.pool.get('res.users').browse(cr, uid, user_ids, context=context) (0, 0, {'user_id': user.id, 'user_login': user.login})
for user in users: for user in user_model.browse(cr, uid, user_ids, context=context)
res.append((0, 0, { ]
'wizard_id': wiz_id,
'user_id': user.id,
'user_login': user.login,
}))
return {'user_ids': res}
def change_password_button(self, cr, uid, id, context=None): _defaults = {
wizard = self.browse(cr, uid, id, context=context)[0] 'user_ids': _default_user_ids,
}
def change_password_button(self, cr, uid, ids, context=None):
wizard = self.browse(cr, uid, ids, context=context)[0]
need_reload = any(uid == user.user_id.id for user in wizard.user_ids) need_reload = any(uid == user.user_id.id for user in wizard.user_ids)
line_ids = [user.id for user in wizard.user_ids]
line_ids = [user.id for user in wizard.user_ids]
self.pool.get('change.password.user').change_password_button(cr, uid, line_ids, context=context) self.pool.get('change.password.user').change_password_button(cr, uid, line_ids, context=context)
# don't keep temporary password copies in the database longer than necessary
self.pool.get('change.password.user').write(cr, uid, line_ids, {'new_passwd': False}, context=context)
if need_reload: if need_reload:
return { return {
@ -971,8 +968,10 @@ class change_password_user(osv.TransientModel):
} }
def change_password_button(self, cr, uid, ids, context=None): def change_password_button(self, cr, uid, ids, context=None):
for user in self.browse(cr, uid, ids, context=context): for line in self.browse(cr, uid, ids, context=context):
self.pool.get('res.users').write(cr, uid, user.user_id.id, {'password': user.new_passwd}) line.user_id.write({'password': line.new_passwd})
# don't keep temporary passwords in the database longer than necessary
self.write(cr, uid, ids, {'new_passwd': False}, context=context)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: