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

[Randhir Mayatra (OpenERP)]

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

Thanks ...

Randhir Mayatra (RMA)

[Luis Gondelles (luis-gondelles)]

FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE ME FROM DISTRIBUTION LIST************* FUCK YOU!!!!!! **********REMOVE...

[Martin Trigaux (OpenERP) (mat-openerp)]

Hello Luis,

Thank you for your review. I understand you disagree with the following merge proposal.
We are open to the discussion if you believe this feature is essential in openerp.

Regards

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

3954. By Randhir Mayatra (OpenERP) on 2014-04-23

[IMP] merge with latest trunk

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

[MERGE] merge with latest trunk

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

It seems you forgot to remove some code in chrome.js. Around line 1320, there is code that is handling Home Action (we want to remove)

review: Needs Fixing

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

review: Needs Resubmitting

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

review: Approve

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

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

[REM] removing menu_di

=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py	2014-04-18 15:14:00 +0000
+++ addons/web/controllers/main.py	2014-04-29 13:57:02 +0000
@@ -1088,16 +1088,7 @@
         """
         s = request.session
         Menus = s.model('ir.ui.menu')
-        # If a menu action is defined use its domain to get the root menu items
-        user_menu_id = s.model('res.users').read([s.uid], ['menu_id'],
-                                                 request.context)[0]['menu_id']
-
         menu_domain = [('parent_id', '=', False)]
-        if user_menu_id:
-            domain_string = s.model('ir.actions.act_window').read(
-                [user_menu_id[0]], ['domain'],request.context)[0]['domain']
-            if domain_string:
-                menu_domain = ast.literal_eval(domain_string)
 
         return Menus.search(menu_domain, 0, False, False, request.context)
 

=== modified file 'addons/web/tests/test_menu.py'
--- addons/web/tests/test_menu.py	2013-10-27 17:17:17 +0000
+++ addons/web/tests/test_menu.py	2014-04-29 13:57:02 +0000
@@ -28,9 +28,7 @@
 
         self.MockMenus = model('ir.ui.menu')
         # Mock the absence of custom menu
-        model('res.users').read.return_value = [{
-            'menu_id': False
-        }]
+        model('res.users').read.return_value = []
 
     def tearDown(self):
         del self.MockMenus