Merge lp:~openerp-dev/openobject-server/trunk-remove-menu_id-from-user-rma into lp:openobject-server

[Randhir Mayatra (OpenERP)]

Hello,
   -- remove menu_id field from user model
      -- removed label 'Menu Customization', Home Action and Menu Action Fields from setting->users->preferences.

Thanks..

Randhir Mayatra(RMA)

[lp:~openerp-dev/openobject-server/trunk-remove-menu_id-from-user-rma]

5109. By Randhir Mayatra (OpenERP) on 2014-04-14

[IMP] remove 'action_menu_admin' record, because its not required anymore

5110. By Randhir Mayatra (OpenERP) on 2014-04-24

[MERGE] merge with latest trunk

5111. By Vidhin Mehta (OpenERP) on 2014-04-29

[IMP]add action_id

5112. By Vidhin Mehta (OpenERP) on 2014-04-29

[IMP]indent

5113. By Vidhin Mehta (OpenERP) on 2014-04-29

[IMP]

[Vidhin Mehta (OpenERP) (vme-openerp)]

review: Needs Resubmitting

[Richard Mathot (Odoo, formerly OpenERP) (rim-openerp)]

LGTM

review: Approve

[lp:~openerp-dev/openobject-server/trunk-remove-menu_id-from-user-rma]

5114. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-29

[FIX] Dirty revert

=== modified file 'openerp/addons/base/base_data.xml'
--- openerp/addons/base/base_data.xml	2014-01-30 09:31:09 +0000
+++ openerp/addons/base/base_data.xml	2014-04-29 13:52:26 +0000
@@ -11,15 +11,6 @@
             </field>
             <field name="field_parent">child_id</field>
         </record>
-        <record id="action_menu_admin" model="ir.actions.act_window">
-            <field name="name">Menu</field>
-            <field name="usage">menu</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_id" ref="view_menu"/>
-            <field name="res_model">ir.ui.menu</field>
-            <field name="view_type">tree</field>
-            <field name="domain">[('parent_id', '=', False)]</field>
-        </record>
 
         <record id="lang_en" model="res.lang">
             <field name="code">en_US</field>
@@ -75,7 +66,6 @@
             <field name="partner_id" ref="base.partner_root"/>
             <field name="company_id" ref="main_company"/>
             <field name="company_ids" eval="[(4, ref('main_company'))]"/>
-            <field name="menu_id" ref="action_menu_admin"/>
             <field name="signature">--
 Administrator</field>
         </record>

=== modified file 'openerp/addons/base/res/res_users.py'
--- openerp/addons/base/res/res_users.py	2014-04-09 10:33:37 +0000
+++ openerp/addons/base/res/res_users.py	2014-04-29 13:52:26 +0000
@@ -154,8 +154,7 @@
                  "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."),
+        '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
@@ -217,16 +216,6 @@
             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 = []
@@ -244,7 +233,6 @@
         'password': '',
         'active': True,
         'customer': False,
-        'menu_id': _get_menu,
         'company_id': _get_company,
         'company_ids': _get_companies,
         'groups_id': _get_group,

=== modified file 'openerp/addons/base/res/res_users_view.xml'
--- openerp/addons/base/res/res_users_view.xml	2014-03-04 17:52:31 +0000
+++ openerp/addons/base/res/res_users_view.xml	2014-04-29 13:52:26 +0000
@@ -201,7 +201,6 @@
                                     </group>
                                     <group string="Menus Customization" groups="base.group_no_one">
                                         <field name="action_id"/>
-                                        <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
                                     </group>
                                 </group>
                                 <group string="Messaging and Social" name="messaging">