summaryrefslogtreecommitdiff
path: root/addons/website_mail_group/controllers/main.py
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2014-05-13 16:38:31 +0200
committerFabien Meghazi <fme@openerp.com>2014-05-13 16:38:31 +0200
commitc3cfc4bc32db1567c774632770b7d413dcf2c973 (patch)
tree96c08dfa19ce79fba2caef471ecdbf1902215154 /addons/website_mail_group/controllers/main.py
parentc321b3f2f72b2a44b7b2dacda4ed15d794665730 (diff)
[MERGE] sitemap backport, merge trunk from 9438 til 9440
merge from 9438 revid:fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4 til 9440 revid:fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
Diffstat (limited to 'addons/website_mail_group/controllers/main.py')
-rw-r--r--addons/website_mail_group/controllers/main.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index 628aa874e7f..88eb1a7e9b7 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -77,7 +77,7 @@ class MailGroup(http.Controller):
return request.website.render('website_mail_group.group_messages', values)
@http.route([
- "/groups/<model('mail.group'):group>/<model('mail.message'):message>",
+ '''/groups/<model('mail.group'):group>/<model('mail.message', "[('model','=','mail.group'), ('res_id','=',group[0])]"):message>''',
], type='http', auth="public", website=True)
def thread_discussion(self, group, message, mode='thread', date_begin=None, date_end=None, **post):
cr, uid, context = request.cr, request.uid, request.context