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

Merge remote-tracking branch 'remotes/lorochka85/bug852_use_media_slug_instead_of_id'

Browse Source 
Conflicts:
	mediagoblin/decorators.py
	mediagoblin/templates/mediagoblin/user_pages/media.html
	mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
This commit is contained in:
Christopher Allan Webber
2011-12-04 23:14:08 -06:00
parent a085dda5d2 707001950a
commit 04b0b7a124
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mediagoblin/tests/test_submission.py
View File

@@ -171,7 +171,7 @@ class TestSubmission:
request.urlgen('mediagoblin.user_pages.media_confirm_delete',
# No work: user=media.uploader().username,
user=self.test_user['username'],
media=media._id),
media=media.slug),
# no value means no confirm
{})
@@ -191,7 +191,7 @@ class TestSubmission:
request.urlgen('mediagoblin.user_pages.media_confirm_delete',
# No work: user=media.uploader().username,
user=self.test_user['username'],
media=media._id),
media=media.slug),
{'confirm': 'y'})
response.follow()