summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Lesuisse <al@openerp.com>2012-10-24 13:17:46 +0200
committerAntony Lesuisse <al@openerp.com>2012-10-24 13:17:46 +0200
commitaebe743964575c9d9a90b8e6dbcd2d7efd4b4db8 (patch)
treebcbed764cfbd972cbc9c6e1885db17ebf79c48b1
parent0445d740a7495afc594cf952822a88df06db84a8 (diff)
[FIX] revert remove password fp merge
Overriding the reset password meachnism should be done in auth signup/reset password addons. bzr revid: al@openerp.com-20121024111746-r94n1uqyb01a4x0m
-rw-r--r--openerp/addons/base/res/res_users.py7
-rw-r--r--openerp/addons/base/res/res_users_view.xml3
2 files changed, 9 insertions, 1 deletions
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 6b93a6e1e42..27fb7603c7e 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -486,6 +486,13 @@ class res_users(osv.osv):
'tag': 'reload',
}
+ def preference_change_password(self, cr, uid, ids, context=None):
+ return {
+ 'type': 'ir.actions.client',
+ 'tag': 'change_password',
+ 'target': 'new',
+ }
+
def has_group(self, cr, uid, group_ext_id):
"""Checks whether user belongs to given group.
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 7c4988bd1f0..78579fc66df 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -213,7 +213,8 @@
<field name="signature" readonly="0"/>
</group>
<footer>
- <button name="preference_save" type="object" class="oe_highlight" string="Save"/>
+ <button name="preference_change_password" type="object" string="Change password"/>
+ <button name="preference_save" type="object" string="Save"/>
or
<button name="preference_cancel" string="Cancel" special="cancel" class="oe_link"/>
</footer>