diff --git a/pillar/web/nodes/custom/comments.py b/pillar/web/nodes/custom/comments.py index fcbfb3ae..a3edf50c 100644 --- a/pillar/web/nodes/custom/comments.py +++ b/pillar/web/nodes/custom/comments.py @@ -206,10 +206,14 @@ def comments_for_node(node_id): for reply in comment['_replies']['_items']: enrich(reply) + nr_of_comments = sum(1 + comment['_replies']['_meta']['total'] + for comment in comments['_items']) + # Data will be requested via javascript return render_template('nodes/custom/comment/list_embed.html', node_id=node_id, comments=comments, + nr_of_comments=nr_of_comments, can_post_comments=can_post_comments) diff --git a/src/templates/nodes/custom/comment/list_embed.jade b/src/templates/nodes/custom/comment/list_embed.jade index cb5ba551..b1fa1d6c 100644 --- a/src/templates/nodes/custom/comment/list_embed.jade +++ b/src/templates/nodes/custom/comment/list_embed.jade @@ -71,7 +71,7 @@ section#comments-list-header #comments-list-title - | {% if comments['_meta']['total'] == 0 %}No{% else %}{{ comments['_meta']['total'] }}{% endif %} comment{{ comments['_meta']['total']|pluralize }} + | {% if nr_of_comments == 0 %}No{% else %}{{ nr_of_comments }}{% endif %} comment{{ nr_of_comments|pluralize }} #comments-list-items | {% for comment in comments['_items'] %} | {{ macros.render_comment(comment, False) }}