diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-08-28 22:05:54 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-08-28 22:05:54 -0500 |
| commit | 7dc3a66f924c734cbee68677e84f5b656eefe280 (patch) | |
| tree | df091eb3589ec2a7ab711acbe137af3c97a583f0 /mediagoblin/user_pages | |
| parent | ad56a4826b987a0fa8f65849d3611f61cc1f50d6 (diff) | |
| parent | 46df0297e029c075a2c28b0c31490c560c99158c (diff) | |
| download | mediagoblin-7dc3a66f924c734cbee68677e84f5b656eefe280.tar.lz mediagoblin-7dc3a66f924c734cbee68677e84f5b656eefe280.tar.xz mediagoblin-7dc3a66f924c734cbee68677e84f5b656eefe280.zip | |
Merge remote branch 'remotes/jwandborg/f403_ability_to_delete'
Conflicts:
mediagoblin/edit/views.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/user_pages/routing.py
Diffstat (limited to 'mediagoblin/user_pages')
| -rw-r--r-- | mediagoblin/user_pages/routing.py | 2 | ||||
| -rw-r--r-- | mediagoblin/user_pages/views.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 65c0fa64..55ee8e4d 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -32,6 +32,8 @@ user_routes = [ Route('mediagoblin.edit.attachments', '/{user}/m/{media}/attachments/', controller="mediagoblin.edit.views:edit_attachments"), + Route('mediagoblin.confirm.confirm_delete', "/{user}/m/{media}/confirm/", + controller="mediagoblin.confirm.views:confirm_delete"), Route('mediagoblin.user_pages.atom_feed', '/{user}/atom/', controller="mediagoblin.user_pages.views:atom_feed"), Route('mediagoblin.user_pages.media_post_comment', diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 2d9bcd21..080d98d7 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -130,7 +130,7 @@ def media_post_comment(request): comment = request.db.MediaComment() comment['media_entry'] = ObjectId(request.matchdict['media']) comment['author'] = request.user['_id'] - comment['content'] = request.POST['comment_content'] + comment['content'] = unicode(request.POST['comment_content']) comment['content_html'] = cleaned_markdown_conversion(comment['content']) |