diff options
| author | Boris Bobrov <breton@cynicmansion.ru> | 2018-07-10 18:29:30 +0200 |
|---|---|---|
| committer | Boris Bobrov <breton@cynicmansion.ru> | 2018-07-10 18:29:30 +0200 |
| commit | e08de70757b6f973bc2955f1b3292d383a19b21d (patch) | |
| tree | f60ad20e55538e1945cbc61284b09540dd601975 /mediagoblin/edit | |
| parent | 588162b861f4993ee8412b14601b215505134bfc (diff) | |
| parent | 7ab18019782b285a5bf9fc79227e0d0d4896398a (diff) | |
| download | mediagoblin-e08de70757b6f973bc2955f1b3292d383a19b21d.tar.lz mediagoblin-e08de70757b6f973bc2955f1b3292d383a19b21d.tar.xz mediagoblin-e08de70757b6f973bc2955f1b3292d383a19b21d.zip | |
Merge remote-tracking branch 'gsoc2016/Subtitle-1'
Diffstat (limited to 'mediagoblin/edit')
| -rw-r--r-- | mediagoblin/edit/routing.py | 2 | ||||
| -rw-r--r-- | mediagoblin/edit/views.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py index b349975d..d3ae5465 100644 --- a/mediagoblin/edit/routing.py +++ b/mediagoblin/edit/routing.py @@ -29,4 +29,4 @@ add_route('mediagoblin.edit.verify_email', '/edit/verify_email/', add_route('mediagoblin.edit.email', '/edit/email/', 'mediagoblin.edit.views:change_email') add_route('mediagoblin.edit.deauthorize_applications', '/edit/deauthorize/', - 'mediagoblin.edit.views:deauthorize_applications') + 'mediagoblin.edit.views:deauthorize_applications')
\ No newline at end of file diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index a296a184..717241e8 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -34,7 +34,7 @@ from mediagoblin.edit.lib import may_edit_media from mediagoblin.decorators import (require_active_login, active_user_from_url, get_media_entry_by_id, user_may_alter_collection, get_user_collection, user_has_privilege, - user_not_banned) + user_not_banned, user_may_delete_media) from mediagoblin.tools.crypto import get_timed_signer_url from mediagoblin.tools.metadata import (compact_and_validate, DEFAULT_CHECKER, DEFAULT_SCHEMA) @@ -538,4 +538,4 @@ def edit_metadata(request, media): request, 'mediagoblin/edit/metadata.html', {'form':form, - 'media':media}) + 'media':media})
\ No newline at end of file |