From efb38d5825b788ca7f60a3cfd00bdf4b993851c4 Mon Sep 17 00:00:00 2001
From: Fabio Caccamo <fabio.caccamo@gmail.com>
Date: Wed, 6 Feb 2019 17:01:17 +0100
Subject: [PATCH] Fixed #53 - Cancel button does not work

---
 admin_interface/static/admin/js/cancel.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/admin_interface/static/admin/js/cancel.js b/admin_interface/static/admin/js/cancel.js
index cfd8b86..2e08819 100644
--- a/admin_interface/static/admin/js/cancel.js
+++ b/admin_interface/static/admin/js/cancel.js
@@ -1,24 +1,18 @@
-if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
-{
+if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined') {
     (function($) {
-
         'use strict';
-
         $(document).ready(function() {
-
             $('.cancel-link').click(function(e) {
                 e.preventDefault();
                 var parentWindow = window.parent;
-                if (parentWindow && typeof(parentWindow.dismissRelatedObjectModal) === 'function') {
+                if (parentWindow && typeof(parentWindow.dismissRelatedObjectModal) === 'function' && parentWindow !== window) {
                     parentWindow.dismissRelatedObjectModal();
                 } else {
                     // fallback to default behavior
-                    history.back();
+                    window.history.back();
                 }
                 return false;
             });
-
         });
-
     })(django.jQuery);
 }
\ No newline at end of file