[MERGE] Merged with main addons.

bzr revid: tde@openerp.com-20120515073246-73t1llk8rmt2z4a7

2 files changed, 21 insertions, 0 deletions

diff --git a/addons/web_shortcuts/controllers/__init__.py b/addons/web_shortcuts/controllers/__init__.py
new file mode 100644
index 00000000000..9f828025b8e
--- /dev/null
+++ b/addons/web_shortcuts/controllers/__init__.py
@@ -0,0 +1,3 @@
+import main
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_shortcuts/controllers/main.py b/addons/web_shortcuts/controllers/main.py
new file mode 100644
index 00000000000..23f4bbd3fbe
--- /dev/null
+++ b/addons/web_shortcuts/controllers/main.py
@@ -0,0 +1,18 @@
+try:
+    # embedded
+    import openerp.addons.web.common.http as openerpweb
+    import openerp.addons.web.controllers.main as webmain
+except ImportError:
+    # standalone
+    import web.common.http as openerpweb
+    import web.controllers.main as webmain
+
+class Shortcuts(openerpweb.Controller):
+    _cp_path = "/web/shortcuts"
+
+    @openerpweb.jsonrequest
+    def list(self, req):
+        return req.session.model('ir.ui.view_sc').get_sc(
+            req.session._uid, "ir.ui.menu", req.session.eval_context(req.context))
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: