summaryrefslogtreecommitdiff
path: root/addons/website_mail/controllers/main.py
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2013-09-05 17:18:03 +0200
committerFabien Meghazi <fme@openerp.com>2013-09-05 17:18:03 +0200
commitd2e90f062187e9ccbe67bc9f778393141b03ffa2 (patch)
tree5a7734c988e27d02c0db5adbbc430af7bc2c39de /addons/website_mail/controllers/main.py
parentc80cf7d0646463b290137c26fbada568a6942b00 (diff)
[BREAK] request.context everywhere
some stuff broken will be repaired by chm bzr revid: fme@openerp.com-20130905151803-7d17us7rn9yubnb2
Diffstat (limited to 'addons/website_mail/controllers/main.py')
-rw-r--r--addons/website_mail/controllers/main.py42
1 files changed, 20 insertions, 22 deletions
diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index 194281f9d93..32a93dfaf45 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -32,13 +32,13 @@ class website_mail(http.Controller):
}
if not request.webcontext.is_public_user and mail_group_id:
- message_follower_ids = group_obj.read(request.cr, request.uid, [mail_group_id], ['message_follower_ids'])[0]['message_follower_ids']
- parent_id = user_obj.browse(request.cr, SUPERUSER_ID, request.uid).partner_id.id
+ message_follower_ids = group_obj.read(request.cr, request.uid, [mail_group_id], ['message_follower_ids'], request.context)[0]['message_follower_ids']
+ parent_id = user_obj.browse(request.cr, SUPERUSER_ID, request.uid, request.context).partner_id.id
values['subscribe'] = parent_id in message_follower_ids
domain = mail_group_id and [("res_id", "=", mail_group_id)] or []
- for group in message_obj.read_group(request.cr, request.uid, domain + group_obj.get_domain_public_blog(request.cr, request.uid), ['subject', 'date'], groupby="date", orderby="create_date asc"):
+ for group in message_obj.read_group(request.cr, request.uid, domain + group_obj.get_domain_public_blog(request.cr, request.uid), ['subject', 'date'], groupby="date", orderby="create_date asc", context=request.context):
year = group['date'].split(" ")[1]
if not values['nav_list'].get(year):
values['nav_list'][year] = {'name': year, 'date_count': 0, 'months': []}
@@ -46,21 +46,21 @@ class website_mail(http.Controller):
values['nav_list'][year]['months'].append(group)
if blog_id:
- values['blog_id'] = message_obj.browse(request.cr, request.uid, blog_id)
+ values['blog_id'] = message_obj.browse(request.cr, request.uid, blog_id, request.context)
else:
step = 20
- message_count = len(group_obj.get_public_message_ids(request.cr, request.uid, domain=domain, order="create_date desc"))
+ message_count = len(group_obj.get_public_message_ids(request.cr, request.uid, domain=domain, order="create_date desc", context=request.context))
pager = website.pager(url="/blog/%s/" % mail_group_id, total=message_count, page=page, step=step, scope=7)
- message_ids = group_obj.get_public_message_ids(request.cr, request.uid, domain=domain, order="create_date desc", limit=step, offset=pager['offset'])
+ message_ids = group_obj.get_public_message_ids(request.cr, request.uid, domain=domain, order="create_date desc", limit=step, offset=pager['offset'], context=request.context)
values['pager'] = pager
- values['blog_ids'] = message_obj.browse(request.cr, request.uid, message_ids)
+ values['blog_ids'] = message_obj.browse(request.cr, request.uid, message_ids, request.context)
return request.webcontext.render("website_mail.index", values)
@website.route(['/blog/nav'], type='http', auth="public")
def nav(self, **post):
- comment_ids = request.registry['mail.group'].get_public_message_ids(request.cr, request.uid, domain=safe_eval(post.get('domain')), order="create_date asc", limit=None)
- return simplejson.dumps(request.registry['mail.message'].read(request.cr, request.uid, comment_ids, ['website_published', 'subject', 'res_id']))
+ comment_ids = request.registry['mail.group'].get_public_message_ids(request.cr, request.uid, domain=safe_eval(post.get('domain')), order="create_date asc", limit=None, context=request.context)
+ return simplejson.dumps(request.registry['mail.message'].read(request.cr, request.uid, comment_ids, ['website_published', 'subject', 'res_id'], request.context))
@website.route(['/blog/<int:mail_group_id>/<int:blog_id>/post'], type='http', auth="public")
def blog_post(self, mail_group_id=None, blog_id=None, **post):
@@ -77,8 +77,7 @@ class website_mail(http.Controller):
website_published=blog_id and True or False,
type='comment',
subtype='mt_comment',
- context={'mail_create_nosubsrequest.cribe': True},
- )
+ context=dict({'mail_create_nosubsrequest.cribe': True} + request.context))
request.session.body = False
if post.get('body'):
@@ -94,8 +93,7 @@ class website_mail(http.Controller):
website_published=False,
type='comment',
subtype='mt_comment',
- context={'mail_create_nosubsrequest.cribe': True},
- )
+ context=dict({'mail_create_nosubsrequest.cribe': True} + request.context))
return werkzeug.utils.redirect("/blog/%s/%s/" % (mail_group_id, blog_id))
@website.route(['/blog/<int:mail_group_id>/subscribe', '/blog/<int:mail_group_id>/<int:blog_id>/subscribe'], type='http', auth="public")
@@ -106,13 +104,13 @@ class website_mail(http.Controller):
if mail_group_id and 'subscribe' in post and (post.get('email') or not request.webcontext.is_public_user):
if request.webcontext.is_public_user:
- partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, [("email", "=", post.get('email'))])
+ partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, [("email", "=", post.get('email'))], context=request.context)
if not partner_ids:
- partner_ids = [partner_obj.create(request.cr, SUPERUSER_ID, {"email": post.get('email'), "name": "Subscribe: %s" % post.get('email')})]
+ partner_ids = [partner_obj.create(request.cr, SUPERUSER_ID, {"email": post.get('email'), "name": "Subscribe: %s" % post.get('email')}, request.context)]
else:
- partner_ids = [user_obj.browse(request.cr, request.uid, request.uid).partner_id.id]
- group_obj.check_access_rule(request.cr, request.uid, [mail_group_id], 'read')
- group_obj.message_subscribe(request.cr, SUPERUSER_ID, [mail_group_id], partner_ids)
+ partner_ids = [user_obj.browse(request.cr, request.uid, request.uid, request.context).partner_id.id]
+ group_obj.check_access_rule(request.cr, request.uid, [mail_group_id], 'read', request.context)
+ group_obj.message_subscribe(request.cr, SUPERUSER_ID, [mail_group_id], partner_ids, request.context)
return self.blog(mail_group_id=mail_group_id, blog_id=blog_id, subscribe=post.get('email'))
@@ -124,10 +122,10 @@ class website_mail(http.Controller):
if mail_group_id and 'unsubscribe' in post and (post.get('email') or not request.webcontext.is_public_user):
if request.webcontext.is_public_user:
- partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, [("email", "=", post.get('email'))])
+ partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, [("email", "=", post.get('email'))], context=request.context)
else:
- partner_ids = [user_obj.browse(request.cr, request.uid, request.uid).partner_id.id]
- group_obj.check_access_rule(request.cr, request.uid, [mail_group_id], 'read')
- group_obj.message_unsubscribe(request.cr, SUPERUSER_ID, [mail_group_id], partner_ids)
+ partner_ids = [user_obj.browse(request.cr, request.uid, request.uid, request.context).partner_id.id]
+ group_obj.check_access_rule(request.cr, request.uid, [mail_group_id], 'read', request.context)
+ group_obj.message_unsubscribe(request.cr, SUPERUSER_ID, [mail_group_id], partner_ids, request.context)
return self.blog(mail_group_id=mail_group_id, blog_id=blog_id, subscribe=None)