heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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
commit 04b0b7a124
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mediagoblin/decorators.py
View File

@ -58,7 +58,7 @@ def user_may_delete_media(controller):
""" """
def wrapper(request, *args, **kwargs): def wrapper(request, *args, **kwargs):
uploader = request.db.MediaEntry.find_one( uploader = request.db.MediaEntry.find_one(
{'_id': ObjectId(request.matchdict['media'])}).get_uploader() {'slug': request.matchdict['media']}).get_uploader()
if not (request.user['is_admin'] or if not (request.user['is_admin'] or
request.user._id == uploader._id): request.user._id == uploader._id):
return exc.HTTPForbidden() return exc.HTTPForbidden()
@ -95,7 +95,6 @@ def get_user_media_entry(controller):
if not user: if not user:
return render_404(request) return render_404(request)
media = request.db.MediaEntry.find_one( media = request.db.MediaEntry.find_one(
{'slug': request.matchdict['media'], {'slug': request.matchdict['media'],
'state': 'processed', 'state': 'processed',

4
mediagoblin/templates/mediagoblin/user_pages/media.html
View File

@ -120,13 +120,13 @@
<p> <p>
{% set edit_url = request.urlgen('mediagoblin.edit.edit_media', {% set edit_url = request.urlgen('mediagoblin.edit.edit_media',
user= media.get_uploader().username, user= media.get_uploader().username,
media= media._id) %} media= media.slug) %}
<a href="{{ edit_url }}">{% trans %}Edit{% endtrans %}</a> <a href="{{ edit_url }}">{% trans %}Edit{% endtrans %}</a>
</p> </p>
<p> <p>
{% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete', {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
user= media.get_uploader().username, user= media.get_uploader().username,
media= media._id) %} media= media.slug) %}
<a href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a> <a href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
</p> </p>
{% endif %} {% endif %}

2
mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
View File

@ -23,7 +23,7 @@
<form action="{{ request.urlgen('mediagoblin.user_pages.media_confirm_delete', <form action="{{ request.urlgen('mediagoblin.user_pages.media_confirm_delete',
user=media.get_uploader().username, user=media.get_uploader().username,
media=media._id) }}" media=media.slug) }}"
method="POST" enctype="multipart/form-data"> method="POST" enctype="multipart/form-data">
<div class="grid_8 prefix_1 suffix_1 edit_box form_box"> <div class="grid_8 prefix_1 suffix_1 edit_box form_box">
<h1> <h1>

4
mediagoblin/tests/test_submission.py
View File

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