diff options
| author | chm@openerp.com <> | 2014-05-02 11:26:59 +0200 |
|---|---|---|
| committer | chm@openerp.com <> | 2014-05-02 11:26:59 +0200 |
| commit | f299180399a2a994f9011161dc54b9973b194d2a (patch) | |
| tree | ad9d746899d365d730f820792b629dfaf5e2338f /addons/website_mail/controllers/main.py | |
| parent | 1199b60d7000b56852a0bd8881fea90a95b01bc7 (diff) | |
[FIX] website_mail: request.website.user_id.id
bzr revid: chm@openerp.com-20140502092659-1gwsx6lmgmtcf80q
Diffstat (limited to 'addons/website_mail/controllers/main.py')
| -rw-r--r-- | addons/website_mail/controllers/main.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py index a6b400ec4a1..0932794ee28 100644 --- a/addons/website_mail/controllers/main.py +++ b/addons/website_mail/controllers/main.py @@ -32,14 +32,13 @@ class WebsiteMail(http.Controller): partner_obj = request.registry['res.partner'] user_obj = request.registry['res.users'] - website = request.registry['website'] _id = int(id) _message_is_follower = message_is_follower == 'on' _object = request.registry[object] # search partner_id - public_id = website.get_public_user(cr, uid, context) + public_id = request.website.user_id.id if uid != public_id: partner_ids = [user_obj.browse(cr, uid, uid, context).partner_id.id] else: @@ -68,10 +67,9 @@ class WebsiteMail(http.Controller): partner_obj = request.registry.get('res.partner') users_obj = request.registry.get('res.users') obj = request.registry.get(model) - website = request.registry['website'] partner_id = None - public_id = website.get_public_user(cr, uid, context) + public_id = request.website.user_id.id if uid != public_id: partner_id = users_obj.browse(cr, SUPERUSER_ID, uid, context).partner_id elif request.session.get('partner_id'): |