archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Fixed a KeyError when editing a comment.

Browse Source
This commit is contained in:
Sybren A. Stüvel 2018-03-28 12:36:03 +02:00
parent d3ff88e5cf
commit 8288455468
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pillar/api/nodes/custom/comment.py
View File

@ -162,7 +162,10 @@ def edit_comment(user_id, node_id, patch):
log.info('User %s edited comment %s', user_id, node_id) log.info('User %s edited comment %s', user_id, node_id)
# Fetch the new content, so the client can show these without querying again. # Fetch the new content, so the client can show these without querying again.
node = nodes_coll.find_one(node_id, projection={'properties._content_html': 1}) node = nodes_coll.find_one(node_id, projection={
'properties.content': 1,
'properties._content_html': 1,
})
return status, node return status, node

4
pillar/web/nodes/custom/comments.py
View File

@ -70,6 +70,7 @@ def comments_create():
@login_required @login_required
def comment_edit(comment_id): def comment_edit(comment_id):
"""Allows a user to edit their comment.""" """Allows a user to edit their comment."""
from pillar.web import jinja
api = system_util.pillar_api() api = system_util.pillar_api()
@ -80,7 +81,8 @@ def comment_edit(comment_id):
return jsonify({ return jsonify({
'status': 'success', 'status': 'success',
'data': { 'data': {
'content_html': result.properties['_content_html'], 'content': result.properties.content or '',
'content_html': jinja.do_markdowned(result.properties, 'content'),
}}) }})