From c2a92a5be2478960e18217dd8bbe951b0b74a2c8 Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Tue, 4 Mar 2014 14:24:47 +0530 Subject: [PATCH 1/6] [IMP] remove menu_id from user model bzr revid: rajmyt@gmail.com-20140304085447-zknvpkfe4i3d8uku --- openerp/addons/base/base_data.xml | 1 - openerp/addons/base/res/res_users.py | 15 +-------------- openerp/addons/base/res/res_users_view.xml | 4 ---- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml index b6c12e111ff..96e13773cae 100644 --- a/openerp/addons/base/base_data.xml +++ b/openerp/addons/base/base_data.xml @@ -75,7 +75,6 @@ - -- Administrator diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index b2aba694078..fad3691a831 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -154,8 +154,6 @@ class res_users(osv.osv): "a change of password, the user has to login again."), 'signature': fields.text('Signature'), 'active': fields.boolean('Active'), - 'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at logon for this user, in addition to the standard menu."), - 'menu_id': fields.many2one('ir.actions.actions', 'Menu Action', help="If specified, the action will replace the standard menu for this user."), 'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'), # Special behavior for this field: res.company.search() will only return the companies # available to the current user (should be the user's companies?), when the user_preference @@ -216,16 +214,6 @@ class res_users(osv.osv): return [c] return False - def _get_menu(self,cr, uid, context=None): - dataobj = self.pool.get('ir.model.data') - try: - model, res_id = dataobj.get_object_reference(cr, uid, 'base', 'action_menu_admin') - if model != 'ir.actions.act_window': - return False - return res_id - except ValueError: - return False - def _get_group(self,cr, uid, context=None): dataobj = self.pool.get('ir.model.data') result = [] @@ -243,7 +231,6 @@ class res_users(osv.osv): 'password': '', 'active': True, 'customer': False, - 'menu_id': _get_menu, 'company_id': _get_company, 'company_ids': _get_companies, 'groups_id': _get_group, @@ -251,7 +238,7 @@ class res_users(osv.osv): } # User can write on a few of his own fields (but not his groups for example) - SELF_WRITEABLE_FIELDS = ['password', 'signature', 'action_id', 'company_id', 'email', 'name', 'image', 'image_medium', 'image_small', 'lang', 'tz'] + SELF_WRITEABLE_FIELDS = ['password', 'signature', 'company_id', 'email', 'name', 'image', 'image_medium', 'image_small', 'lang', 'tz'] # User can read a few of his own fields SELF_READABLE_FIELDS = ['signature', 'company_id', 'login', 'email', 'name', 'image', 'image_medium', 'image_small', 'lang', 'tz', 'tz_offset', 'groups_id', 'partner_id', '__last_update'] diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index ba603c7a0f0..bb47f022a08 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -199,10 +199,6 @@ - - - - From a80d6878a63928c5ba1784423a105e297edff5e4 Mon Sep 17 00:00:00 2001 From: Randhir Mayatra rma-openerp Date: Mon, 14 Apr 2014 18:03:21 +0530 Subject: [PATCH 2/6] [IMP] remove 'action_menu_admin' record, because its not required anymore bzr revid: rma@tinyerp.com-20140414123321-mh0ecde7m7mhjiff --- openerp/addons/base/base_data.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml index 96e13773cae..728f1d43647 100644 --- a/openerp/addons/base/base_data.xml +++ b/openerp/addons/base/base_data.xml @@ -11,15 +11,6 @@ child_id - - Menu - menu - ir.actions.act_window - - ir.ui.menu - tree - [('parent_id', '=', False)] - en_US From 32674d563d347840c2f45d524f5a3352869ce4c3 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Tue, 29 Apr 2014 17:43:49 +0530 Subject: [PATCH 3/6] [IMP]add action_id bzr revid: vme@tinyerp.com-20140429121349-ikq6iz1wswme7btn --- openerp/addons/base/res/res_users.py | 3 ++- openerp/addons/base/res/res_users_view.xml | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index cb6bafd8a83..5bbd397a8e3 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -154,6 +154,7 @@ class res_users(osv.osv): "a change of password, the user has to login again."), 'signature': fields.text('Signature'), 'active': fields.boolean('Active'), + 'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at log on for this user, in addition to the standard menu."), 'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'), # Special behavior for this field: res.company.search() will only return the companies # available to the current user (should be the user's companies?), when the user_preference @@ -239,7 +240,7 @@ class res_users(osv.osv): } # User can write on a few of his own fields (but not his groups for example) - SELF_WRITEABLE_FIELDS = ['password', 'signature', 'company_id', 'email', 'name', 'image', 'image_medium', 'image_small', 'lang', 'tz'] + SELF_WRITEABLE_FIELDS = ['password', 'signature', 'action_id', 'company_id', 'email', 'name', 'image', 'image_medium', 'image_small', 'lang', 'tz'] # User can read a few of his own fields SELF_READABLE_FIELDS = ['signature', 'company_id', 'login', 'email', 'name', 'image', 'image_medium', 'image_small', 'lang', 'tz', 'tz_offset', 'groups_id', 'partner_id', '__last_update'] diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index e54b33cffd0..a71bbcdc913 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -199,6 +199,10 @@ + + - + - + From b93ca4f5fe76df02899ff31c0cd70e4294ae1eec Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Tue, 29 Apr 2014 17:46:50 +0530 Subject: [PATCH 4/6] [IMP]indent bzr revid: vme@tinyerp.com-20140429121650-n5resq8mwbxkjpcs --- openerp/addons/base/res/res_users_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index a71bbcdc913..6f903857409 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -200,8 +200,8 @@ - - - - + - + - From e8cf1cfb3642f7ebaf07731749bacd68c2480b41 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Tue, 29 Apr 2014 17:52:09 +0530 Subject: [PATCH 5/6] [IMP] bzr revid: vme@tinyerp.com-20140429122209-djy2py9bswt602to --- openerp/addons/base/res/res_users_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 6f903857409..8a3f372af7a 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -200,8 +200,8 @@ - - - - + + From c7e68feca83c0ce52fe815e827db3a588facaf9a Mon Sep 17 00:00:00 2001 From: "Richard Mathot (OpenERP)" Date: Tue, 29 Apr 2014 15:52:00 +0200 Subject: [PATCH 6/6] [FIX] Dirty revert bzr revid: rim@openerp.com-20140429135200-m6sx0gx0ga2qrk4g --- openerp/addons/base/res/res_users_view.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 8a3f372af7a..ba1cee1e140 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -201,7 +201,6 @@ -