diff --git a/signbank/dictionary/templates/dictionary/manage_lexicons.html b/signbank/dictionary/templates/dictionary/manage_lexicons.html index 074b1ac4..983e5097 100644 --- a/signbank/dictionary/templates/dictionary/manage_lexicons.html +++ b/signbank/dictionary/templates/dictionary/manage_lexicons.html @@ -25,11 +25,11 @@
{{obj.copyright}}
{% blocktrans %}Public ECV{% endblocktrans %}: - http://{{ request.get_host }}{% url 'dictionary:public_gloss_list_xml' obj.id %}
+ {% if obj.is_public %}{% blocktrans %}Public ECV{% endblocktrans %}: + https://{{ current_site_domain }}{% url 'dictionary:public_gloss_list_xml' obj.id %}
{% endif %} -{% blocktrans %}Advanced ECV{% endblocktrans %}: - http://{{ request.get_host }}{% url 'dictionary:gloss_list_xml' obj.id %}
+{% blocktrans %}Advanced ECV{% endblocktrans %}: + https://{{ current_site_domain }}{% url 'dictionary:gloss_list_xml' obj.id %}
{% if user.is_superuser %}{{obj.copyright}}
{% if obj.is_public %}{% blocktrans %}Public ECV{% endblocktrans %}: - http://{{ request.get_host }}{% url 'dictionary:public_gloss_list_xml' obj.id %}
+{% blocktrans %}Public ECV{% endblocktrans %}: + https://{{ current_site_domain }}{% url 'dictionary:public_gloss_list_xml' obj.id %}
{% endif %} diff --git a/signbank/dictionary/views.py b/signbank/dictionary/views.py index 170032d4..01cb553b 100644 --- a/signbank/dictionary/views.py +++ b/signbank/dictionary/views.py @@ -8,6 +8,7 @@ from django.contrib import messages from django.contrib.auth.decorators import permission_required from django.contrib.admin.views.decorators import user_passes_test +from django.contrib.sites.shortcuts import get_current_site from django.core.exceptions import PermissionDenied from django.urls import reverse, reverse_lazy from django.utils.translation import ugettext as _ @@ -91,6 +92,8 @@ def get_context_data(self, **kwargs): qs = self.get_queryset() context['has_permissions'] = qs.filter(has_view_perm=True) context['no_permissions'] = qs.filter(has_view_perm=False) + current_site = get_current_site(self.request) + context['current_site_domain'] = getattr(current_site, 'domain', self.request.get_host()) # Show users with permissions to lexicons to SuperUsers if self.request.user.is_superuser: for lexicon in context['has_permissions']: