diff options
author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-10-07 15:48:33 -0500 |
---|---|---|
committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-10-07 15:48:33 -0500 |
commit | 56c4ad89ebef32bd5a40c00d987811ce4501ce22 (patch) | |
tree | 7523b2b274ce512093aed3914520275c80fe7e8f /mediagoblin/edit/views.py | |
parent | 345b958871c48df56b8d1acf9516bb9780aa6701 (diff) | |
parent | 0a24db84c5769149537b0d9bd8e3a88fe8e9522a (diff) | |
download | mediagoblin-56c4ad89ebef32bd5a40c00d987811ce4501ce22.tar.lz mediagoblin-56c4ad89ebef32bd5a40c00d987811ce4501ce22.tar.xz mediagoblin-56c4ad89ebef32bd5a40c00d987811ce4501ce22.zip |
Merge remote-tracking branch 'refs/remotes/tilly-q/OPW-Moderation-Update'
Conflicts:
mediagoblin/templates/mediagoblin/user_pages/user.html
mediagoblin/tests/test_auth.py
mediagoblin/tests/test_submission.py
Diffstat (limited to 'mediagoblin/edit/views.py')
-rw-r--r-- | mediagoblin/edit/views.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index 140f9eec..80590875 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -83,7 +83,7 @@ def edit_media(request, media): return redirect_obj(request, media) - if request.user.is_admin \ + if request.user.has_privilege(u'admin') \ and media.uploader != request.user.id \ and request.method != 'POST': messages.add_message( @@ -184,7 +184,7 @@ def legacy_edit_profile(request): def edit_profile(request, url_user=None): # admins may edit any user profile if request.user.username != url_user.username: - if not request.user.is_admin: + if not request.user.has_privilege(u'admin'): raise Forbidden(_("You can only edit your own profile.")) # No need to warn again if admin just submitted an edited profile @@ -324,7 +324,7 @@ def edit_collection(request, collection): return redirect_obj(request, collection) - if request.user.is_admin \ + if request.user.has_privilege(u'admin') \ and collection.creator != request.user.id \ and request.method != 'POST': messages.add_message( |