Merge lp:~openerp-dev/openobject-client-web/6.0-bug-16165-msh into lp:openobject-client-web

[Xavier (Open ERP)]

Hello,

Changed the code so that when record opened in new tab at that time menu remains persistent, before that when record was opened in new tab menu were changed and by default sale menu came. This was handled by revision no. 4642 but due to this revision issue 16165 was arise i.e. parent_id not found that is because we are setting id of data in active_id of context so according to revision 4642 the code will make rpc call with active_id of context for fetching menu id which is actually id of data.

Thanx.

[Anup(SerpentCS) (anup-serpent)]

Hello Mohammed,Xavier,

The issue has been fixed by revision 4676 <email address hidden> in the stable v6.

Hence for the shake of clarity I am rejecting this branch.

Thanks.

review: Disapprove

Unmerged revisions

4671. By Mohammed Shekha(Open ERP) on 2011-07-22

[FIX] Fix the issues related to active_id

4670. By Mohammed Shekha(Open ERP) on 2011-07-21

[FIX] Fixed the issue of readonly button when form is not saved in o2m

=== modified file 'addons/openerp/controllers/actions.py'
--- addons/openerp/controllers/actions.py	2011-05-23 13:07:54 +0000
+++ addons/openerp/controllers/actions.py	2011-07-26 12:43:45 +0000
@@ -198,7 +198,7 @@
     if not action.get('opened'):
         action.setdefault('target', 'current')
         return act_window_opener(action, data)
-
+    
     for key in ('res_id', 'res_model', 'view_type',
                 'view_mode', 'limit', 'search_view'):
         data[key] = action.get(key, data.get(key))
@@ -226,7 +226,13 @@
         view_ids = [action['view_id'][0]]
     if not action.get('domain'):
         action['domain'] = '[]'
-
+    
+    global menu_id
+    menu_id = False
+    
+    if not data['context'].get('active_id'):
+        menu_id = data.get('id', False)
+    
     ctx = dict(data.get('context', {}),
         active_id=data.get('id', False),
         active_ids=data.get('ids', []),
@@ -367,8 +373,8 @@
 
     if open_new_tab:
         parent_id = False
-        if data['context'] and data['context'].get('active_id') and not data.get('model'):
-            parent = rpc.RPCProxy('ir.ui.menu').read([int(data['context']['active_id'])],['complete_name'], rpc.session.context)[0]['complete_name'].split('/')[0]
+        if menu_id:
+            parent = rpc.RPCProxy('ir.ui.menu').read([int(menu_id)],['complete_name'], rpc.session.context)[0]['complete_name'].split('/')[0]
             parent_id = rpc.RPCProxy('ir.ui.menu').search([('name','=', parent),('parent_id','=',False)],0,0,0, rpc.session.context)
         if parent_id:
             url = '/openerp/?' + urllib.urlencode({'active': parent_id[0],'next': url})