aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsaksham1115 <saksham115@gmail.com>2016-07-13 15:09:49 +0000
committersaksham1115 <saksham115@gmail.com>2016-07-19 17:29:24 +0000
commit772a07e94f037f62f013aca376019989ebf8cb28 (patch)
tree228ec18578034918228735f09535f85890b7a5c4
parentdef53bc3ed189b2e9928b4046a3c2c8a61e31d59 (diff)
downloadmediagoblin-772a07e94f037f62f013aca376019989ebf8cb28.tar.lz
mediagoblin-772a07e94f037f62f013aca376019989ebf8cb28.tar.xz
mediagoblin-772a07e94f037f62f013aca376019989ebf8cb28.zip
Only video uploader can edit their subtitles
-rw-r--r--mediagoblin/edit/views.py4
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/media.html4
-rw-r--r--mediagoblin/user_pages/routing.py2
3 files changed, 7 insertions, 3 deletions
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 6b22fbae..eb9334e9 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -584,8 +584,10 @@ def edit_metadata(request, media):
from mediagoblin.tools.subtitles import open_subtitle,save_subtitle
@require_active_login
+@get_media_entry_by_id
+@user_may_delete_media
@path_subtitle
-def custom_subtitles(request,path=None):
+def custom_subtitles(request,media,path=None):
text = open_subtitle(path)
form = forms.CustomizeSubtitlesForm(request.form,
subtitle=text)
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index f7997571..2ba561dd 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -236,8 +236,10 @@
{%- for subtitle in media.subtitle_files %}
<li>
<a href="{{ request.urlgen('mediagoblin.edit.custom_subtitles',
+ user=media.get_actor.username,
+ media_id=media.id,
path=subtitle.filepath) }}">
- {{- subtitle.name -}}
+ {{- subtitle.name -}}
</li>
{%- endfor %}
</ul>
diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py
index 0165ab6c..beb16a0f 100644
--- a/mediagoblin/user_pages/routing.py
+++ b/mediagoblin/user_pages/routing.py
@@ -122,5 +122,5 @@ add_route('mediagoblin.edit.metadata',
add_route('mediagoblin.edit.custom_subtitles',
- '/c_s/<string:path>',
+ '/u/<string:user>/m/<int:media_id>/c_s/<string:path>',
'mediagoblin.edit.views:custom_subtitles') \ No newline at end of file