diff options
Diffstat (limited to 'addons/mail/mail_group_menu.py')
| -rw-r--r-- | addons/mail/mail_group_menu.py | 39 |
1 files changed, 9 insertions, 30 deletions
diff --git a/addons/mail/mail_group_menu.py b/addons/mail/mail_group_menu.py index 61856a88b59..68a4e644c87 100644 --- a/addons/mail/mail_group_menu.py +++ b/addons/mail/mail_group_menu.py @@ -1,28 +1,9 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2012-today OpenERP SA (<http://www.openerp.com>) -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/> -# -############################################################################## -from openerp.osv import osv -from openerp.osv import fields +from openerp import api, fields, models -class ir_ui_menu(osv.osv): + +class IrUiMenu(models.Model): """ Override of ir.ui.menu class. When adding mail_thread module, each new mail.group will create a menu entry. This overrides checks that the current user is in the mail.group followers. If not, the menu @@ -31,15 +12,13 @@ class ir_ui_menu(osv.osv): """ _inherit = 'ir.ui.menu' - _columns = { - 'mail_group_id': fields.many2one('mail.group', 'Mail Group') - } + mail_group_id = fields.Many2one('mail.group', 'Mail Group') def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False): """ Remove mail.group menu entries when the user is not a follower.""" - ids = super(ir_ui_menu, self).search(cr, uid, args, offset=offset, - limit=limit, order=order, - context=context, count=False) + ids = super(IrUiMenu, self).search(cr, uid, args, offset=offset, + limit=limit, order=order, + context=context, count=False) if ids: cr.execute(""" SELECT id FROM ir_ui_menu m @@ -47,8 +26,8 @@ class ir_ui_menu(osv.osv): SELECT 1 FROM mail_followers WHERE res_model = 'mail.group' AND res_id = m.mail_group_id AND partner_id = (SELECT partner_id FROM res_users WHERE id = %s) - ) AND id in %s - """, (uid, tuple(ids))) + ) AND id in %s + """, (uid, tuple(ids))) # Preserve original search order visible_ids = set(x[0] for x in cr.fetchall()) ids = [i for i in ids if i in visible_ids] |