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

Merge remote branch 'remotes/elrond/idea/use_media_url_for_self'

Browse Source
This commit is contained in:
Christopher Allan Webber 2011-09-10 17:42:50 -05:00
commit 55376ff403
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mediagoblin/edit/views.py
View File

@ -73,8 +73,8 @@ def edit_media(request, media):
media['slug'] = unicode(request.POST['slug'])
media.save()
return redirect(request, "mediagoblin.user_pages.media_home",
user=media.uploader()['username'], media=media['slug'])
return exc.HTTPFound(
location=media.url_for_self(request.urlgen))
if request.user['is_admin'] \
and media['uploader'] != request.user['_id'] \
@ -130,9 +130,8 @@ def edit_attachments(request, media):
% (request.POST['attachment_name']
or request.POST['attachment_file'].filename))
return redirect(request, 'mediagoblin.user_pages.media_home',
user=media.uploader()['username'],
media=media['slug'])
return exc.HTTPFound(
location=media.url_for_self(request.urlgen))
return render_to_response(
request,
'mediagoblin/edit/attachments.html',

5
mediagoblin/user_pages/views.py
View File

@ -165,9 +165,8 @@ def media_confirm_delete(request, media):
return redirect(request, "mediagoblin.user_pages.user_home",
user=username)
else:
return redirect(request, "mediagoblin.user_pages.media_home",
user=media.uploader()['username'],
media=media['slug'])
return exc.HTTPFound(
location=media.url_for_self(request.urlgen))
if ((request.user[u'is_admin'] and
request.user[u'_id'] != media.uploader()[u'_id'])):