From fc8dc74de4681bc117192ab6990a1c84fba6469f Mon Sep 17 00:00:00 2001
From: Eric Riggs <ericriggs42@gmail.com>
Date: Wed, 7 Mar 2018 02:11:46 -0400
Subject: [PATCH] Don't use the previous variable when canceling a form action.
 Form now use only javascript's history.back().

Signed-off-by: Eric Riggs <ericriggs42@gmail.com>
---
 mayan/apps/appearance/templates/appearance/generic_confirm.html | 2 +-
 .../templates/appearance/generic_form_subtemplate.html          | 2 +-
 .../templates/appearance/generic_multiform_subtemplate.html     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mayan/apps/appearance/templates/appearance/generic_confirm.html b/mayan/apps/appearance/templates/appearance/generic_confirm.html
index 5e39d252a5..84527ed2d0 100644
--- a/mayan/apps/appearance/templates/appearance/generic_confirm.html
+++ b/mayan/apps/appearance/templates/appearance/generic_confirm.html
@@ -49,7 +49,7 @@
                     </button>
 
                     {% if previous %}
-                        <a class="btn btn-primary" onclick='{% if previous %}window.location.replace("{{ previous }}");{% else %}history.back();{% endif %}'>{% trans 'No' %}</a>
+                        <a class="btn btn-primary" onclick='history.back();'>{% trans 'No' %}</a>
                     {% endif %}
 
                 </form>
diff --git a/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html
index f876b901c3..9b20b75226 100644
--- a/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html
+++ b/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html
@@ -75,7 +75,7 @@
             <div class="form-group">
                 <button class="btn btn-primary" name="{% if form.prefix %}{{ form.prefix }}-submit{% else %}submit{% endif %}" type="submit"><i class="{{ submit_icon|default:'fa fa-check' }}"></i> {% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}{% endif %}</button>
                 {% if previous %}
-                      &nbsp;<a class="btn btn-default" onclick='{% if previous %}window.location.replace("{{ previous }}");{% else %}history.back();{% endif %}'>
+                      &nbsp;<a class="btn btn-default" onclick='history.back();'>
                         <i class="fa fa-times"></i> {% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %}
                       </a>
                 {% endif %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_multiform_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_multiform_subtemplate.html
index 52b4593a1b..e7ffcf627b 100644
--- a/mayan/apps/appearance/templates/appearance/generic_multiform_subtemplate.html
+++ b/mayan/apps/appearance/templates/appearance/generic_multiform_subtemplate.html
@@ -63,7 +63,7 @@
                     <button class="btn btn-primary" name="{% if form.prefix %}{{ form.prefix }}-submit{% else %}submit{% endif %}" type="submit"><i class="{{ submit_icon|default:'fa fa-check' }}"></i> {% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}{% endif %}</button>
                 {% endif %}
                 {% if previous %}
-                      &nbsp;<a class="btn btn-default" onclick='{% if previous %}window.location.replace("{{ previous }}");{% else %}history.back();{% endif %}'>
+                      &nbsp;<a class="btn btn-default" onclick='history.back();'>
                         <i class="fa fa-cross"></i> {% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %}
                       </a>
                 {% endif %}