Merge remote-tracking branch 'gsoc2016/Subtitle-1'

[mediagoblin.git] / mediagoblin / edit / views.py

diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index a296a18416099ef31b8643dfbd3f4c6ae9eda67a..717241e8b63ef48989c13a1ef36963b904bb4fd5 100644 (file)
--- 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