diff --git a/pod/enrichment/templates/enrichment/video_enrichment.html b/pod/enrichment/templates/enrichment/video_enrichment.html index 23e4e7109f..c4f8652b36 100644 --- a/pod/enrichment/templates/enrichment/video_enrichment.html +++ b/pod/enrichment/templates/enrichment/video_enrichment.html @@ -38,39 +38,6 @@ {% csrf_token %} -

{% if video.licence %}{% endif %} {{video.title|title}} {% if video.date_evt %}[{{ video.date_evt }}]{% endif %} @@ -110,7 +77,11 @@

 {% trans 'Other versions' %} {% if request.user.playlist_set.all and video.is_draft == False %} diff --git a/pod/interactive/templates/interactive/video_interactive.html b/pod/interactive/templates/interactive/video_interactive.html index 844a42b976..d8da530e89 100644 --- a/pod/interactive/templates/interactive/video_interactive.html +++ b/pod/interactive/templates/interactive/video_interactive.html @@ -86,7 +86,13 @@

 {% trans 'Other versions' %} {% if request.user.playlist_set.all and video.is_draft == False %} diff --git a/pod/video/models.py b/pod/video/models.py index fd75e4e13b..7b57948e0f 100755 --- a/pod/video/models.py +++ b/pod/video/models.py @@ -743,10 +743,13 @@ def get_other_version(self): ) return version - def get_default_version_link(self): + def get_default_version_link(self, slug_private): for version in self.get_other_version(): if version["link"] == VERSION_CHOICES_DICT[self.get_version]: - return version["url"] + if slug_private: + return version["url"]+slug_private+"/" + else: + return version["url"] def get_viewcount(self): count_sum = self.viewcount_set.all().aggregate(Sum('count')) diff --git a/pod/video/templates/videos/video.html b/pod/video/templates/videos/video.html index 07ea233eaf..2e56c50b31 100644 --- a/pod/video/templates/videos/video.html +++ b/pod/video/templates/videos/video.html @@ -192,7 +192,7 @@

{%endif%} - {% with video.get_other_version as versions %} + {% with video.get_other_version as versions %} {% if versions|length > 0 %} diff --git a/pod/video/views.py b/pod/video/views.py index beb7c46e9d..dc68367a87 100644 --- a/pod/video/views.py +++ b/pod/video/views.py @@ -544,7 +544,7 @@ def video(request, slug, slug_c=None, slug_t=None, slug_private=None): video.get_version != "O" and request.GET.get('redirect') != "false" ): - return redirect(video.get_default_version_link()) + return redirect(video.get_default_version_link(slug_private)) return render_video(request, id, slug_c, slug_t, slug_private, template_video, params)