odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] better xml for comments 

bzr revid: fp@tinyerp.com-20140308180859-tcqx0vyr6bx25jyg
This commit is contained in:
Fabien Pinckaers 2014-03-08 19:08:59 +01:00
parent f3616cb63a
commit fd35713850
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/website_forum/controllers/main.py
View File

@ -133,7 +133,7 @@ class website_forum(http.Controller):
return request.website.render("website_forum.post_description_full", values)
@http.route(['/forum/<model("website.forum"):forum>/comment'], type='http', auth="public", methods=['POST'], website=True)
def post_comment(self, forum, post_id=1, **kwargs):
def post_comment(self, forum, post_id, **kwargs):
cr, uid, context = request.cr, request.uid, request.context
if kwargs.get('comment'):
user = request.registry['res.users'].browse(cr, SUPERUSER_ID, uid, context=context)
@ -147,6 +147,7 @@ class website_forum(http.Controller):
body=kwargs.get('comment'),
type='comment',
subtype='mt_comment',
content_subtype='plaintext',
author_id=user.partner_id.id,
context=dict(context, mail_create_nosubcribe=True))

40
addons/website_forum/views/website_forum.xml
View File

@ -578,26 +578,28 @@
</template>
<template id="comments">
<h4 class="mt10"> <b>Comments</b> </h4>
<div class="mb10 css_editable_mode_hidden">
<form id="comment" t-attf-action="/forum/#{ slug(forum) }/comment" method="POST">
<input name="post_id" t-att-value="object.id" type="hidden"/>
<textarea rows="2" name="comment" class="form-control" placeholder="Write a comment..."></textarea>
<button type="submit" class="btn btn-primary mt8">Post</button>
</form>
</div>
<div class="clearfix"/>
<ul class="media-list" id="comments-list">
<li t-foreach="object.website_message_ids" t-as="message" class="media">
<div class="media-body">
<div t-field="message.body"/>
<h5 class="media-heading">
<div class="row clearfix">
<div class="col-sm-10 col-sm-offset-2">
<div t-foreach="object.website_message_ids" t-as="message">
<small class="text-muted">
<div t-field="message.body"/>
<a t-attf-href="/forum/#{ slug(forum) }/user/#{ message.author_id.id }" t-field="message.author_id"/>
<small>on <span t-field="message.date"/></small>
</h5>
on <span t-field="message.date" t-field-options='{"format":"short"}'/>
</small>
<hr class="mt4 mb4"/>
</div>
</li>
</ul>
<div class="css_editable_mode_hidden">
<a data-toggle="collapse" t-attf-data-target="#comment#{ object._name.replace('.','') + '-' + str(object.id) }">
add a comment
</a>
<form t-attf-id="comment#{ object._name.replace('.','') + '-' + str(object.id) }" class="collapse" t-attf-action="/forum/#{ slug(forum) }/comment" method="POST">
<input name="post_id" t-att-value="object.id" type="hidden"/>
<textarea name="comment" class="form-control" placeholder="Comment this post..."/>
<button type="submit" class="btn btn-primary mt8">Post</button>
</form>
</div>
</div>
</div>
</template>
<template id="tag">
@ -817,7 +819,7 @@
<a t-attf-href="/forum/#{ slug(forum) }/badge/#{ slug(badge.badge_id) }" class="badge">
<span t-field="badge.badge_id.name" />
</a>
<span>
<span>
X <t t-esc="len(badge.badge_id.owner_ids)"/>
</span>
</div>