From 1d300c0b71746cb8984c5d3bd5ef9f244dd18844 Mon Sep 17 00:00:00 2001
From: shagi <shagi@gisa-elkartea.org>
Date: Tue, 1 Feb 2022 09:49:16 +0100
Subject: [PATCH] Cancel url for GAS views

---
 gas/templates/gas/base_form.html |  2 +-
 gas/views.py                     | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/gas/templates/gas/base_form.html b/gas/templates/gas/base_form.html
index 130716c..450f044 100644
--- a/gas/templates/gas/base_form.html
+++ b/gas/templates/gas/base_form.html
@@ -20,7 +20,7 @@
         <ul class="actions">
         {% block form_actions %}
             {% if not is_popup %}
-                <li><a href="{{ view.get_success_url }}">{% trans "Cancel" %}</a></li>
+                <li><a href="{{ view.get_cancel_url }}">{% trans "Cancel" %}</a></li>
             {% endif %}
 
             <li><button type="submit">{% trans "Save" %}</button>
diff --git a/gas/views.py b/gas/views.py
index ace0295..e25c083 100644
--- a/gas/views.py
+++ b/gas/views.py
@@ -6,7 +6,6 @@ from django.core.exceptions import ImproperlyConfigured
 from django.db import router
 from django.http import HttpResponse, HttpResponseRedirect, HttpResponseBadRequest
 from django.urls import reverse
-from django.utils.encoding import force_text
 from django.utils.html import escape, escapejs
 from django.utils.text import capfirst
 from django.utils.translation import gettext_lazy as _
@@ -107,10 +106,18 @@ class GASMixin:
     def get_success_message(self):
         return self.success_message
 
+    def get_cancel_url(self):
+        if self.cancel_url:
+            # Forcing possible reverse_lazy evaluation
+            url = str(self.cancel_url)
+            return url
+        else:
+            return self.get_success_url()
+
     def get_continue_url(self):
         if self.continue_url:
             # Forcing possible reverse_lazy evaluation
-            url = force_text(self.continue_url)
+            url = str(self.continue_url)
             return url
         else:
             raise ImproperlyConfigured("No URL to redirect to. Provide a continue_url.")