From 406ec22fa31ebef5a260045b80866ff9b3c0588b Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 9 Feb 2012 13:18:17 +0100
Subject: [PATCH] [IMP] portal: remove hack to retrieve menu root for portal
 users, it now works for all users

bzr revid: rco@openerp.com-20120209121817-b2wcrl4mg1vkr2b2
---
 addons/portal/__init__.py   |  1 -
 addons/portal/ir_ui_menu.py | 60 -------------------------------------
 2 files changed, 61 deletions(-)
 delete mode 100644 addons/portal/ir_ui_menu.py

diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
index b35d11bac45..65b924183e1 100644
--- a/addons/portal/__init__.py
+++ b/addons/portal/__init__.py
@@ -22,7 +22,6 @@
 import portal
 import wizard
 import res_user
-import ir_ui_menu
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal/ir_ui_menu.py b/addons/portal/ir_ui_menu.py
deleted file mode 100644
index c8f59ca8bd1..00000000000
--- a/addons/portal/ir_ui_menu.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 OpenERP S.A (<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/>.
-#
-##############################################################################
-
-import logging
-
-from osv import osv, fields
-from tools.safe_eval import safe_eval
-
-class portal_menu(osv.osv):
-    """
-        Fix menu class to customize the login search for menus,
-        as web client 6.0 does not support the menu action properly yet
-    """
-    _name = 'ir.ui.menu'
-    _inherit = 'ir.ui.menu'
-
-    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
-        if context is None:
-            context = {}
-        
-        # if the user belongs to a portal, we have to rewrite any search on the
-        # top menus to be under the portal's parent menu
-        if not context.get('ir.ui.menu.full_list') and uid != 1 and \
-                args == [('parent_id', '=', False)]:
-            portal_obj = self.pool.get('res.portal')
-            portal_ids = portal_obj.search(cr, uid, [('users', 'in', uid)])
-            if portal_ids:
-                if len(portal_ids) > 1:
-                    log = logging.getLogger('ir.ui.menu')
-                    log.warning('User %s belongs to several portals', str(uid))
-                p = portal_obj.browse(cr, uid, portal_ids[0])
-                # if the portal overrides the menu, use its domain
-                if p.menu_action_id:
-                    args = safe_eval(p.menu_action_id.domain)
-        
-        return super(portal_menu, self).search(cr, uid, args, offset=offset,
-                    limit=limit, order=order, context=context, count=count)
-
-portal_menu()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: