diff options
| -rw-r--r-- | bin/addons/base/base_update.xml | 4 | ||||
| -rw-r--r-- | bin/addons/base/res/res_user.py | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml index c2a00326da5..0224644603d 100644 --- a/bin/addons/base/base_update.xml +++ b/bin/addons/base/base_update.xml @@ -197,7 +197,7 @@ <field domain="[('usage','=','menu')]" name="menu_id" required="True"/> <field colspan="4" name="signature"/> <group col="4" colspan="4"> - <button icon='gtk-cancel' name="action_next" type='object' string='Skip & Continue'/> + <button icon='gtk-cancel' special="cancel" name="action_next" type='object' string='Skip & Continue'/> <button name='action_new' icon='gtk-ok' type='object' string='Add Other User'/> <button name='action_continue' icon='gtk-ok' type='object' string='Continue'/> </group> @@ -246,7 +246,7 @@ to understand." colspan="2"/> <newline/> <group> - <button icon="gtk-cancel" special="cancel" string="Cancel"/> + <button icon="gtk-cancel" special="cancel" name="action_cancel" type="object" string="Cancel"/> <button icon="gtk-ok" name="action_set" string="Set" type="object"/> </group> diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py index 8807be87e4b..8ce752ebcd7 100644 --- a/bin/addons/base/res/res_user.py +++ b/bin/addons/base/res/res_user.py @@ -242,6 +242,16 @@ class res_config_view(osv.osv_memory): _defaults={ 'view':lambda *args: 'simple', } + + def action_cancel(self,cr,uid,ids,conect=None): + print ' Cancel action' + return { + 'view_type': 'form', + "view_mode": 'form', + 'res_model': 'ir.module.module.configuration.wizard', + 'type': 'ir.actions.act_window', + 'target':'new', + } def action_set(self, cr, uid, ids, context=None): res=self.read(cr,uid,ids)[0] users_obj = self.pool.get('res.users') |