From d6a006028e116ba6d724d44c8ccc4449df974e68 Mon Sep 17 00:00:00 2001
From: Adil Houmadi <ah@taktik.be>
Date: Tue, 30 Jun 2015 11:56:38 +0200
Subject: [PATCH 1/3] [FIX] : make sure that the menu still exists in odoo
 [IMP] : simplify the code

---
 web_shortcuts/model/web_shortcut.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/web_shortcuts/model/web_shortcut.py b/web_shortcuts/model/web_shortcut.py
index aea9938e..acc4521e 100644
--- a/web_shortcuts/model/web_shortcut.py
+++ b/web_shortcuts/model/web_shortcut.py
@@ -39,14 +39,17 @@ class web_shortcut(models.Model):
     @api.model
     def get_user_shortcuts(self, user_id):
         shortcuts = self.search([('user_id', '=', user_id)])
-        results = shortcuts.read(['menu_id'])
-        ir_ui_menu_obj = self.env['ir.ui.menu']
-        menus = ir_ui_menu_obj.search([('id', 'in', [x['menu_id'][0]
-                                                     for x in results])])
-        name_map = dict(menus.name_get())
-        # Make sure to return only shortcuts pointing to existing menu items.
-        filtered_results = filter(lambda result: result['menu_id'][0] in
-                                  name_map, results)
-        for result in filtered_results:
-            result.update(name=name_map[result['menu_id'][0]])
-        return filtered_results
+        res = []
+        for shortcut in shortcuts:
+            if shortcut.menu_id:
+                _name = shortcut.menu_id.name_get()
+                _name = _name[0][1] if len(_name) else ''
+                _id = shortcut.menu_id.id
+                res.append(
+                    {
+                        'id': shortcut.id,
+                        'name': _name,
+                        'menu_id': (_id, _name)
+                    }
+                )
+        return res

From 7deb03adb1b878a57edccaa05c807666e66c9735 Mon Sep 17 00:00:00 2001
From: Adil Houmadi <ah@taktik.be>
Date: Tue, 30 Jun 2015 12:37:12 +0200
Subject: [PATCH 2/3] [IMP] : simplify the code, use filtered function instead
 of a simple condition

---
 web_shortcuts/model/web_shortcut.py | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/web_shortcuts/model/web_shortcut.py b/web_shortcuts/model/web_shortcut.py
index acc4521e..4325ef8b 100644
--- a/web_shortcuts/model/web_shortcut.py
+++ b/web_shortcuts/model/web_shortcut.py
@@ -40,16 +40,15 @@ class web_shortcut(models.Model):
     def get_user_shortcuts(self, user_id):
         shortcuts = self.search([('user_id', '=', user_id)])
         res = []
-        for shortcut in shortcuts:
-            if shortcut.menu_id:
-                _name = shortcut.menu_id.name_get()
-                _name = _name[0][1] if len(_name) else ''
-                _id = shortcut.menu_id.id
-                res.append(
-                    {
-                        'id': shortcut.id,
-                        'name': _name,
-                        'menu_id': (_id, _name)
-                    }
-                )
+        for shortcut in shortcuts.filtered('menu_id'):
+            _name = shortcut.menu_id.name_get()
+            _name = _name[0][1] if len(_name) else ''
+            _id = shortcut.menu_id.id
+            res.append(
+                {
+                    'id': shortcut.id,
+                    'name': _name,
+                    'menu_id': (_id, _name)
+                }
+            )
         return res

From aeb9ac3105cdcbbd33506df46f05302ccdaaa6ac Mon Sep 17 00:00:00 2001
From: Adil Houmadi <ah@taktik.be>
Date: Mon, 13 Jul 2015 15:23:57 +0200
Subject: [PATCH 3/3] [IMP] : override unlink method to remove deprecated
 web.shortcut object [IMP] : add ondelete cascade on menu_id field [IMP] :
 change class name from web_shortcut to WebShortcut

---
 web_shortcuts/model/web_shortcut.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/web_shortcuts/model/web_shortcut.py b/web_shortcuts/model/web_shortcut.py
index 4325ef8b..9065e2de 100644
--- a/web_shortcuts/model/web_shortcut.py
+++ b/web_shortcuts/model/web_shortcut.py
@@ -22,11 +22,11 @@
 from openerp import models, fields, api
 
 
-class web_shortcut(models.Model):
+class WebShortcut(models.Model):
     _name = 'web.shortcut'
 
     name = fields.Char('Shortcut Name', size=64)
-    menu_id = fields.Many2one('ir.ui.menu')
+    menu_id = fields.Many2one('ir.ui.menu', ondelete='cascade')
     user_id = fields.Many2one('res.users', 'User Ref.', required=True,
                               ondelete='cascade', select=True,
                               default=lambda obj, cr, uid, context: uid)
@@ -52,3 +52,15 @@ class web_shortcut(models.Model):
                 }
             )
         return res
+
+
+class IrUiView(models.Model):
+    _inherit = 'ir.ui.menu'
+
+    @api.multi
+    def unlink(self):
+        res = super(IrUiView, self).unlink()
+        shortcuts = self.env['web.shortcut'].search([('menu_id', '=', False)])
+        for shortcut in shortcuts:
+            shortcut.unlink()
+        return res