diff --git a/combo/apps/lingo/manager_views.py b/combo/apps/lingo/manager_views.py index 84498f1a..586f60ae 100644 --- a/combo/apps/lingo/manager_views.py +++ b/combo/apps/lingo/manager_views.py @@ -52,6 +52,7 @@ class RegieUpdateView(UpdateView): def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) ctx['callback_url'] = self.request.build_absolute_uri(self.object.callback_url) + ctx['return_url'] = self.request.build_absolute_uri(reverse('lingo-return', args=[self.object.pk])) return ctx diff --git a/combo/apps/lingo/templates/lingo/regie_form.html b/combo/apps/lingo/templates/lingo/regie_form.html index 892d287d..567298d5 100644 --- a/combo/apps/lingo/templates/lingo/regie_form.html +++ b/combo/apps/lingo/templates/lingo/regie_form.html @@ -11,8 +11,9 @@ {% block content %}
- {% if object.id and callback_url %} -

{{ callback_url }}

+ {% if object.pk %} + {% if callback_url %}

{{ callback_url }}

{% endif %} + {% if return_url %}

{{ return_url }}

{% endif %} {% endif %} {% csrf_token %} {{ form.as_p }} diff --git a/tests/test_lingo_manager.py b/tests/test_lingo_manager.py index be2f5b54..23161328 100644 --- a/tests/test_lingo_manager.py +++ b/tests/test_lingo_manager.py @@ -74,6 +74,8 @@ def test_edit_regie(app, admin_user, payment_backend): % payment_backend.slug in resp ) + regie = Regie.objects.all()[0] + assert '

http://testserver/lingo/return/%s/

' % regie.pk in resp resp.forms[0]['description'] = 'other description' resp = resp.forms[0].submit()