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/lib.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/lib.py')
| -rw-r--r-- | mediagoblin/edit/lib.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/edit/lib.py b/mediagoblin/edit/lib.py index aab537a0..6acebc96 100644 --- a/mediagoblin/edit/lib.py +++ b/mediagoblin/edit/lib.py @@ -19,6 +19,6 @@ def may_edit_media(request, media): """Check, if the request's user may edit the media details""" if media.uploader == request.user.id: return True - if request.user.is_admin: + if request.user.has_privilege(u'admin'): return True return False |