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

[IMP] improve change user password wizard. 

bzr revid: ysa@tinyerp.com-20110103132326-18qzic0k7lk1sq2y
This commit is contained in:
Yogesh Sakhreliya 2011-01-03 18:53:26 +05:30
parent 470f98b9d4
commit 2218b36b50
2 changed files with 8 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bin/addons/base/base_update.xml
View File

@ -70,34 +70,6 @@
======================
-->
<record id="view_change_user_password_form" model="ir.ui.view">
<field name="name">change.user.password</field>
<field name="model">change.user.password</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Change Password">
<field name="current_password" password="True" readonly="0" colspan="4"/>
<field name="new_password" password="True" readonly="0" colspan="4"/>
<field name="confirm_password" password="True" readonly="0" colspan="4"/>
<label colspan="1" string=""/>
<label colspan="3" string="You must logout and login again after changing your password."/>
<separator colspan="4" />
<label align="0.0" colspan="2" string=""/>
<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
<button colspan="1" icon="gtk-ok" name="change_password" string="Change" type="object"/>
</form>
</field>
</record>
<record id="action_view_change_password_form" model="ir.actions.act_window">
<field name="name">Change Password</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">change.user.password</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record id="view_users_form_simple_modif" model="ir.ui.view">
<field name="name">res.users.form.modif</field>
<field name="model">res.users</field>
@ -119,8 +91,6 @@
<field name="context_lang" completion="1" readonly="0"/>
<field name="context_tz" completion="1" readonly="0"/>
<field name="menu_tips" colspan="2" readonly="0"/>
<label string="" colspan="1"/>
<button name="%(action_view_change_password_form)d" string="Change Password" type="action" icon="gtk-execute"/>
<separator string="Email &amp; Signature" colspan="4"/>
<group colspan="4"><field name="user_email" widget="email" readonly="0"/></group>
<field colspan="4" name="signature" readonly="0" nolabel="1"/>

44
bin/addons/base/res/res_user.py
View File

@ -476,6 +476,13 @@ class users(osv.osv):
finally:
cr.close()
def change_password(self, cr, uid, ids, old_passwd, new_passwd):
if self.browse(cr, uid, uid).password != old_passwd:
raise osv.except_osv(_('AccessDenied'), 'The current password does not match !')
else:
self.write(cr, uid, uid, {'password': new_passwd})
return True
users()
class config_users(osv.osv_memory):
@ -574,39 +581,4 @@ class res_config_view(osv.osv_memory):
res_config_view()
class change_user_password(osv.osv_memory):
_name = 'change.user.password'
_columns = {
'current_password':fields.char('Current Password', size=64, required=True, help="Enter your current password."),
'new_password': fields.char('New Password', size=64, required=True, help="Enter the new password."),
'confirm_password': fields.char('Confirm Password', size=64, required=True, help="Enter the new password again for confirmation."),
}
_defaults={
'current_password' : '',
'new_password' : '',
'confirm_password' : '',
}
def change_password(self, cr, uid, ids, context=None):
for form_id in ids:
password_rec = self.browse(cr, uid, form_id, context)
if password_rec.new_password != password_rec.confirm_password:
raise osv.except_osv(_('Error !'), _('The new and confirmation passwords do not match, please double-check them.'))
# Validate current password without reading it from database,
# as it could be stored differently (LDAP, encrypted/hashed, etc.)
is_correct_password = False
try:
user_obj = self.pool.get('res.users')
is_correct_password = user_obj.check(cr.dbname, uid, password_rec.current_password)
except Exception:
pass
if not is_correct_password:
raise osv.except_osv(_('Error !'), _('The current password does not match, please double-check it.'))
user_obj.write(cr, uid, [uid], {'password': password_rec.new_password}, context=context)
return {}
change_user_password()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: