Merge lp:~openerp-dev/openobject-server/trunk-home-action-rga into lp:openobject-server

[Ravi Gadhia (OpenERP)]

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

No need to add start_menu_id in the menu object. Also it check for every users menu reference and update values on the bases of users?

You can remove that function field and try to do that without that check box.

Also in the domain of start_menu_id .. parent_id=False should be remove because we need those menus where parent is set.

Regards,
Mustufa Rangwala.

review: Needs Fixing

[lp:~openerp-dev/openobject-server/trunk-home-action-rga]

4950. By RGA(OpenERP) on 2013-09-27

Merge with trunk

4951. By RGA(OpenERP) on 2013-09-27

[REV] remove is_start_menu field move logic of fetch start menu to web controller

4952. By RGA(OpenERP) on 2013-10-09

Merge with trunk

4953. By RGA(OpenERP) on 2013-10-09

[REF] refactor code remove some unused code, change field name menu_id to action_id it more appropriate name convention for home action

4954. By RGA(OpenERP) on 2013-10-11

[REF] refactor code

4955. By RGA(OpenERP) on 2013-10-11

Fix typo

4956. By RGA(OpenERP) on 2013-11-11

Merge with trunk

4957. By Martin Trigaux (OpenERP) on 2014-02-19

[MERGE] sync with latest trunk

Unmerged revisions

4957. By Martin Trigaux (OpenERP) on 2014-02-19

[MERGE] sync with latest trunk

4956. By RGA(OpenERP) on 2013-11-11

Merge with trunk

4955. By RGA(OpenERP) on 2013-10-11

Fix typo

4954. By RGA(OpenERP) on 2013-10-11

[REF] refactor code

4953. By RGA(OpenERP) on 2013-10-09

[REF] refactor code remove some unused code, change field name menu_id to action_id it more appropriate name convention for home action

4952. By RGA(OpenERP) on 2013-10-09

Merge with trunk

4951. By RGA(OpenERP) on 2013-09-27

[REV] remove is_start_menu field move logic of fetch start menu to web controller

4950. By RGA(OpenERP) on 2013-09-27

Merge with trunk

4949. By RGA(OpenERP) on 2013-09-13

[IMP] no need to pass user_id hence we not override search

4948. By RGA(OpenERP) on 2013-09-12

[REM] check root menu accessiblity logic when any menu fetch, its burden to achive too litle functinality

=== 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-02-19 08:52:52 +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-01-29 03:20:53 +0000
+++ openerp/addons/base/res/res_users.py	2014-02-19 08:52:52 +0000
@@ -154,8 +154,8 @@
                  "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 open when user login"),
+        'menu_id': fields.many2one('ir.ui.menu', 'Starting Menu', help="If specified, this menu will be open when user login"),
         '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 +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 = []
@@ -243,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-01-15 20:53:57 +0000
+++ openerp/addons/base/res/res_users_view.xml	2014-02-19 08:52:52 +0000
@@ -200,8 +200,8 @@
                                         <field name="tz"/>
                                     </group>
                                     <group string="Menus Customization" groups="base.group_no_one">
+                                        <field name="menu_id" domain="['|',('child_id','=',False),('parent_id','=',False)]"/>
                                         <field name="action_id"/>
-                                        <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
                                     </group>
                                 </group>
                                 <group string="Messaging and Social" name="messaging">