Merge lp:~therp-nl/openerp-web/7.0-lp1175163-TypeError_in_subview_button into lp:openerp-web/7.0

[Stefan Rijnhart (Opener)]

[lp:~therp-nl/openerp-web/7.0-lp1175163-TypeError_in_subview_button]

3915. By Stefan Rijnhart (Opener) on 2013-05-08

[FIX] Indentation

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Fixed independently in revision <email address hidden> so closing this proposal.

Unmerged revisions

3915. By Stefan Rijnhart (Opener) on 2013-05-08

[FIX] Indentation

3914. By Isaac Richter on 2013-05-01

[FIX] TypeError in client JS when pressing subview button

=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js	2013-04-17 13:34:38 +0000
+++ addons/web/static/src/js/views.js	2013-05-08 18:32:24 +0000
@@ -1370,7 +1370,13 @@
             args.push(context);
             return dataset.call_button(action_data.name, args).then(handler).then(function () {
                 if (self.ViewManager.ActionManager) {
-                    self.ViewManager.ActionManager.__parentedParent.menu.do_reload_needaction();
+                    pm = self.ViewManager.ActionManager.__parentedParent;
+                    while((typeof pm.menu === 'undefined') && (typeof pm.__parentedParent !== 'undefined')) {
+                	pm = pm.__parentedParent;
+                    }
+                    if(typeof pm.menu !== 'undefined') {
+                	pm.menu.do_reload_needaction();
+                    }
                 }
             });
         } else if (action_data.type=="action") {