Merge pull request #8 from acsone/10.0-web_shortcut_fix_top_menus_tbi

[10.0] [REF] Web Shortcut: fix compatibility with Odoo Enterprise and Community
OCA · May 5, 2017 · 4c1fa27 · 4c1fa27
2 parents 99b6f00 + 2ec1446
commit 4c1fa27
Showing 1 changed file with 25 additions and 7 deletions.
diff --git a/web_shortcut/static/src/js/web_shortcut.js b/web_shortcut/static/src/js/web_shortcut.js
@@ -78,16 +78,30 @@ odoo.define('web.shortcut', function (require) {
 
     WebClient.include({
         current_action_updated: function (action) {
-            this.shortcut_menu = _.find(this.systray_menu.widgets, function (item) {
-                return item instanceof ShortcutMenu;
-            });
+            if (this.menu.systray_menu) {
+                this.shortcut_menu = _.find(this.menu.systray_menu.widgets, function (item) {
+                    return item instanceof ShortcutMenu;
+                });
+            }
+            else {
+                this.shortcut_menu = _.find(this.systray_menu.widgets, function (item) {
+                    return item instanceof ShortcutMenu;
+                });
+            }
         },
         show_application: function () {
             var self = this;
             return this._super.apply(this, arguments).then(function () {
-                self.shortcut_menu = _.find(self.systray_menu.widgets, function (item) {
-                    return item instanceof ShortcutMenu;
-                });
+                if (self.menu.systray_menu) {
+                    self.shortcut_menu = _.find(self.menu.systray_menu.widgets, function (item) {
+                        return item instanceof ShortcutMenu;
+                    });
+                }
+                else {
+                    self.shortcut_menu = _.find(self.systray_menu.widgets, function (item) {
+                        return item instanceof ShortcutMenu;
+                    });
+                }
                 self.shortcut_menu.on('click', self, function (action_id) {
                     self.do_action(action_id, {
                         clear_breadcrumbs: true,
@@ -136,7 +150,11 @@ odoo.define('web.shortcut', function (require) {
                     if (self.action_manager.webclient.menu_data) {
                         for (var i = 0; i < self.action_manager.webclient.menu_data.children.length; i++) {
                             if (self.action_manager.webclient.menu_data.children[i].id === session.active_id) {
-                                menu_id = self.action_manager.webclient.menu_data.children[i].children[0].id;
+                                menu_temp = self.action_manager.webclient.menu_data.children[i].children[0];
+                                menu_id = menu_temp.id;
+                                if (menu_temp.children[0]){
+                                    menu_id = menu_temp.children[0].id
+                                }
                                 break;
                             }
                         }