Techsystech
/
web_techsystech
forked from Techsystech/web
3
0
Fork 0
Code Pull Requests Activity

Merge pull request #159 from taktik/8.0-fix-web-shortcut-removed-menu-ah 

[FIX][8.0] web_shortcuts : Make sure that the menu still exists in odoo
9.0
Markus Schneider 2015-07-17 15:36:05 +02:00
parent fe7dcd855e aeb9ac3105
commit 0beaeb5d2f
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
web_shortcuts/model/web_shortcut.py
View File

@ -22,11 +22,11 @@
from openerp import models, fields, api from openerp import models, fields, api
class web_shortcut(models.Model): class WebShortcut(models.Model):
_name = 'web.shortcut' _name = 'web.shortcut'
name = fields.Char('Shortcut Name', size=64) 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, user_id = fields.Many2one('res.users', 'User Ref.', required=True,
ondelete='cascade', select=True, ondelete='cascade', select=True,
default=lambda obj, cr, uid, context: uid) default=lambda obj, cr, uid, context: uid)
@ -39,14 +39,28 @@ class web_shortcut(models.Model):
@api.model @api.model
def get_user_shortcuts(self, user_id): def get_user_shortcuts(self, user_id):
shortcuts = self.search([('user_id', '=', user_id)]) shortcuts = self.search([('user_id', '=', user_id)])
results = shortcuts.read(['menu_id']) res = []
ir_ui_menu_obj = self.env['ir.ui.menu'] for shortcut in shortcuts.filtered('menu_id'):
menus = ir_ui_menu_obj.search([('id', 'in', [x['menu_id'][0] _name = shortcut.menu_id.name_get()
for x in results])]) _name = _name[0][1] if len(_name) else ''
name_map = dict(menus.name_get()) _id = shortcut.menu_id.id
# Make sure to return only shortcuts pointing to existing menu items. res.append(
filtered_results = filter(lambda result: result['menu_id'][0] in {
name_map, results) 'id': shortcut.id,
for result in filtered_results: 'name': _name,
result.update(name=name_map[result['menu_id'][0]]) 'menu_id': (_id, _name)
return filtered_results }
)
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