[MERGE] portal fixes groups, payments, shortcut

portal_stock has been removed from this merge, sale_order state is enough.

bzr revid: al@openerp.com-20121208230309-2rajdsjfrb5ddlch

1 files changed, 17 insertions, 14 deletions

diff --git a/addons/web_shortcuts/static/src/js/web_shortcuts.js b/addons/web_shortcuts/static/src/js/web_shortcuts.js
index a2607e3749e..045bc5b5ae6 100644
--- a/addons/web_shortcuts/static/src/js/web_shortcuts.js
+++ b/addons/web_shortcuts/static/src/js/web_shortcuts.js
@@ -126,20 +126,23 @@ instance.web.ViewManagerAction.include({
             $shortcut_toggle.hide();
             return;
         }
-        $shortcut_toggle.toggleClass('oe_shortcuts_remove', shortcuts_menu.has(self.session.active_id));
-        $shortcut_toggle.unbind("click").click(function() {
-            if ($shortcut_toggle.hasClass("oe_shortcuts_remove")) {
-                shortcuts_menu.trigger('remove', self.session.active_id);
-            } else {
-                shortcuts_menu.trigger('add', {
-                    'user_id': self.session.uid,
-                    'res_id': self.session.active_id,
-                    'resource': 'ir.ui.menu',
-                    'name': self.action.name
-                });
-            }
-            $shortcut_toggle.toggleClass("oe_shortcuts_remove");
-        });
+        // Anonymous users don't have user_menu
+        if (shortcuts_menu) {
+            $shortcut_toggle.toggleClass('oe_shortcuts_remove', shortcuts_menu.has(self.session.active_id));
+            $shortcut_toggle.unbind("click").click(function() {
+                if ($shortcut_toggle.hasClass("oe_shortcuts_remove")) {
+                    shortcuts_menu.trigger('remove', self.session.active_id);
+                } else {
+                    shortcuts_menu.trigger('add', {
+                        'user_id': self.session.uid,
+                        'res_id': self.session.active_id,
+                        'resource': 'ir.ui.menu',
+                        'name': self.action.name
+                    });
+                }
+                $shortcut_toggle.toggleClass("oe_shortcuts_remove");
+            });
+        }
     }
 });