heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issue 582: use media.slug instead of media.id

Browse Source
This commit is contained in:
lora 2011-11-19 17:00:25 -06:00
parent 917d4663af
commit 2d62e9efd2
3 changed files with 4 additions and 5 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'])}).uploader() {'slug': request.matchdict['media'] }).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

@ -124,7 +124,7 @@
<p> <p>
{% set edit_url = request.urlgen('mediagoblin.edit.edit_media', {% set edit_url = request.urlgen('mediagoblin.edit.edit_media',
user= media.uploader().username, user= media.uploader().username,
media= media._id) %} media= media.slug) %}
<a href="{{ edit_url }}" <a href="{{ edit_url }}"
><img src="{{ request.staticdirect('/images/icon_edit.png') }}" ><img src="{{ request.staticdirect('/images/icon_edit.png') }}"
class="media_icon" /></a> class="media_icon" /></a>
@ -133,7 +133,7 @@
<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.uploader().username, user= media.uploader().username,
media= media._id) %} media= media.slug) %}
<a href="{{ delete_url }}" <a href="{{ delete_url }}"
><img src="{{ request.staticdirect('/images/icon_delete.png') }}" ><img src="{{ request.staticdirect('/images/icon_delete.png') }}"
class="media_icon" /></a> class="media_icon" /></a>

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.uploader().username, user=media.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>