heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote branch 'remotes/jwandborg/f403_ability_to_delete'

Browse Source 
Conflicts:
	mediagoblin/edit/views.py
	mediagoblin/templates/mediagoblin/user_pages/media.html
	mediagoblin/user_pages/routing.py
This commit is contained in:
Christopher Allan Webber
2011-08-28 22:05:54 -05:00
parent ad56a4826b 46df0297e0
commit 7dc3a66f92
13 changed files with 216 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/user_pages/routing.py
View File

@@ -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',

2
mediagoblin/user_pages/views.py
View File

@@ -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'])