[FIX] mass_mailing,website*,survey: leftover calls to website.get_public_user()

This method was (partially) removed at rev.9421 
rev-id al@openerp.com-20140507153223-q73u5lhyrfw98o3a

bzr revid: odo@openerp.com-20140512103935-o0ue9wzenm5wjejq
This commit is contained in:
Olivier Dony 2014-05-12 12:39:35 +02:00
parent b39aac717d
commit 4cecbd919f
4 changed files with 5 additions and 8 deletions

View File

@ -47,10 +47,9 @@ class MassMailController(http.Controller):
Contacts = request.registry['mail.mass_mailing.contact']
Users = request.registry['res.users']
public_id = request.registry['website'].get_public_user(cr, uid, context)
is_subscriber = False
email = None
if uid != public_id:
if uid != request.website.user_id.id:
email = Users.browse(cr, SUPERUSER_ID, uid, context).email
elif request.session.get('mass_mailing_email'):
email = request.session['mass_mailing_email']

View File

@ -45,7 +45,7 @@ class WebsiteSurvey(http.Controller):
return werkzeug.utils.redirect("/survey/")
# In case of auth required, block public user
if survey.auth_required and uid == request.registry['website'].get_public_user(cr, uid, context):
if survey.auth_required and uid == request.website.user_id.id:
return request.website.render("website.403")
# In case of non open surveys

View File

@ -244,10 +244,8 @@ class WebsiteBlog(http.Controller):
blog_post = request.registry['blog.post']
partner_obj = request.registry['res.partner']
thread_obj = request.registry['mail.thread']
website = request.registry['website']
public_id = website.get_public_user(cr, uid, context)
if uid != public_id:
if uid != request.website.user_id.id:
partner_ids = [user.partner_id.id]
else:
partner_ids = blog_post._find_partner_from_emails(

View File

@ -34,8 +34,8 @@ class WebsiteForum(http.Controller):
def _prepare_forum_values(self, forum=None, **kwargs):
Forum = request.registry['forum.forum']
user = request.registry['res.users'].browse(request.cr, request.uid, request.uid, context=request.context)
public_uid = request.registry['website'].get_public_user(request.cr, request.uid, request.context)
values = {'user': user, 'is_public_user': user.id == public_uid,
values = {'user': user,
'is_public_user': user.id == request.website.user_id.id,
'notifications': self._get_notifications(),
'header': kwargs.get('header', dict()),
'searches': kwargs.get('searches', dict()),