Updated version and CHANGELOG.md.

.travis.yml

@@ -1,46 +1,57 @@
 os: linux
+dist: xenial
 language: python
-python: 3.5
 cache: pip
-env:
-  - TOX_ENV=py27-dj17-sqlite
-  - TOX_ENV=py27-dj17-postgres
-  - TOX_ENV=py27-dj18-sqlite
-  - TOX_ENV=py27-dj18-postgres
-  - TOX_ENV=py27-dj19-sqlite
-  - TOX_ENV=py27-dj19-postgres
-  - TOX_ENV=py27-dj110-sqlite
-  - TOX_ENV=py27-dj110-postgres
-  - TOX_ENV=py27-dj111-sqlite
-  - TOX_ENV=py27-dj111-postgres
-  # - TOX_ENV=py34-dj17-sqlite
-  # - TOX_ENV=py34-dj17-postgres
-  # - TOX_ENV=py34-dj18-sqlite
-  # - TOX_ENV=py34-dj18-postgres
-  # - TOX_ENV=py34-dj19-sqlite
-  # - TOX_ENV=py34-dj19-postgres
-  # - TOX_ENV=py34-dj110-sqlite
-  # - TOX_ENV=py34-dj110-postgres
-  # - TOX_ENV=py34-dj111-sqlite
-  # - TOX_ENV=py34-dj111-postgres
-  # - TOX_ENV=py34-dj20-sqlite
-  # - TOX_ENV=py34-dj20-postgres
-  - TOX_ENV=py35-dj18-sqlite
-  - TOX_ENV=py35-dj18-postgres
-  - TOX_ENV=py35-dj19-sqlite
-  - TOX_ENV=py35-dj19-postgres
-  - TOX_ENV=py35-dj110-sqlite
-  - TOX_ENV=py35-dj110-postgres
-  - TOX_ENV=py35-dj111-sqlite
-  - TOX_ENV=py35-dj111-postgres
-  - TOX_ENV=py35-dj20-sqlite
-  - TOX_ENV=py35-dj20-postgres
-  - TOX_ENV=py35-dj21-sqlite
-  - TOX_ENV=py35-dj21-postgres
-  # - TOX_ENV=py35-dj22-sqlite
-  - TOX_ENV=py35-dj22-postgres
 jobs:
   include:
+    - python: "2.7"
+      env: TOX_ENV=py27-dj17-sqlite
+    - python: "2.7"
+      env: TOX_ENV=py27-dj17-postgres
+    - python: "2.7"
+      env: TOX_ENV=py27-dj18-sqlite
+    - python: "2.7"
+      env: TOX_ENV=py27-dj18-postgres
+    - python: "2.7"
+      env: TOX_ENV=py27-dj19-sqlite
+    - python: "2.7"
+      env: TOX_ENV=py27-dj19-postgres
+    - python: "2.7"
+      env: TOX_ENV=py27-dj110-sqlite
+    - python: "2.7"
+      env: TOX_ENV=py27-dj110-postgres
+    - python: "2.7"
+      env: TOX_ENV=py27-dj111-sqlite
+    - python: "2.7"
+      env: TOX_ENV=py27-dj111-postgres
+    - python: "3.5"
+      env: TOX_ENV=py35-dj18-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj18-postgres
+    - python: "3.5"
+      env: TOX_ENV=py35-dj19-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj19-postgres
+    - python: "3.5"
+      env: TOX_ENV=py35-dj110-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj110-postgres
+    - python: "3.5"
+      env: TOX_ENV=py35-dj111-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj111-postgres
+    - python: "3.5"
+      env: TOX_ENV=py35-dj20-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj20-postgres
+    - python: "3.5"
+      env: TOX_ENV=py35-dj21-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj21-postgres
+    # - python: "3.5"
+    #   env: TOX_ENV=py35-dj22-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj22-postgres
     - python: "3.6"
       env: TOX_ENV=py36-dj111-sqlite
     - python: "3.6"
@@ -66,52 +77,36 @@ jobs:
     - python: "3.6"
       env: TOX_ENV=py36-djmaster-postgres
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj20-sqlite
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj20-postgres
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj21-sqlite
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj21-postgres
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj22-sqlite
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj22-postgres
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj30-sqlite
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj30-postgres
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-djmaster-sqlite
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-djmaster-postgres
     - python: "3.8"
-      dist: xenial
       env: TOX_ENV=py38-dj22-sqlite
     - python: "3.8"
-      dist: xenial
       env: TOX_ENV=py38-dj22-postgres
     - python: "3.8"
-      dist: xenial
       env: TOX_ENV=py38-dj30-sqlite
     - python: "3.8"
-      dist: xenial
       env: TOX_ENV=py38-dj30-postgres
     - python: "3.8"
-      dist: xenial
       env: TOX_ENV=py38-djmaster-sqlite
     - python: "3.8"
-      dist: xenial
       env: TOX_ENV=py38-djmaster-postgres
   allow_failures:
     - env: TOX_ENV=py36-djmaster-sqlite

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.12.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.12.2) - 2020-04-07
+-   Fixed popup javascript error when related modal is inactive. #76
+-   Fixed js self invoking anonymous function expression.
+
 ## [0.12.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.12.1) - 2020-02-21
 -   Updated `.travis` config.
 -   Fixed custom django admin header. #75

admin_interface/static/admin/js/cancel.js

@@ -16,5 +16,5 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined') {
                 return false;
             });
         });
-    }(django.jQuery));
+    })(django.jQuery);
 }

admin_interface/static/admin/js/popup_response.js

@@ -2,51 +2,44 @@
 
     'use strict';
 
-    function getModalWindowData()
+    var windowRef = window;
-    {
+    var windowName, widgetName;
-        var windowRef = window;
+    var openerRef = windowRef.opener;
-        var windowName = windowRef.name;
+    if (!openerRef) {
-        var widgetName = windowName.replace(/^(change|add|delete|lookup)_/, '');
+        // related modal is active
-        var modalRef = {};
+        openerRef = windowRef.parent;
-        var openerRef = windowRef.opener;
+        windowName = windowRef.name;
-        if (!openerRef) {
+        widgetName = windowName.replace(/^(change|add|delete|lookup)_/, '');
-            openerRef = windowRef.parent;
+        windowRef = {
-            modalRef = {
+            name: openerRef.id_to_windowname(widgetName),
-                name: openerRef.id_to_windowname(widgetName),
+            close: function() {
-                close: function() {
+                openerRef.dismissRelatedObjectModal();
-                    openerRef.dismissRelatedObjectModal();
+            }
-                }
+        };
-            };
-        }
-        return { opener:openerRef, modal:modalRef };
     }
 
-    var modalData = getModalWindowData();
+    // default django popup_response.js
-    var modalRef = modalData['modal'];
-    var openerRef = modalData['opener'];
-
     var initData = JSON.parse(document.getElementById('django-admin-popup-response-constants').dataset.popupResponse);
-    // console.log(initData);
     switch (initData.action) {
         case 'change':
             if (typeof(openerRef.dismissChangeRelatedObjectPopup) === 'function') {
-                openerRef.dismissChangeRelatedObjectPopup(modalRef, initData.value, initData.obj, initData.new_value);
+                openerRef.dismissChangeRelatedObjectPopup(windowRef, initData.value, initData.obj, initData.new_value);
             }
             break;
         case 'delete':
             if (typeof(openerRef.dismissDeleteRelatedObjectPopup) === 'function') {
-                openerRef.dismissDeleteRelatedObjectPopup(modalRef, initData.value);
+                openerRef.dismissDeleteRelatedObjectPopup(windowRef, initData.value);
             }
             break;
         default:
             if (typeof(openerRef.dismissAddRelatedObjectPopup) === 'function') {
-                openerRef.dismissAddRelatedObjectPopup(modalRef, initData.value, initData.obj);
+                openerRef.dismissAddRelatedObjectPopup(windowRef, initData.value, initData.obj);
             }
             else if (typeof(openerRef.dismissAddAnotherPopup) === 'function') {
                 // django 1.7 compatibility
-                openerRef.dismissAddAnotherPopup(modalRef, initData.value, initData.obj);
+                openerRef.dismissAddAnotherPopup(windowRef, initData.value, initData.obj);
             }
             break;
     }
 
-}());
+})();

admin_interface/static/admin_interface/related-modal/related-modal.js

@@ -147,5 +147,5 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
             presentRelatedObjectModalOnClickOn('a.dynamic_raw_id-related-lookup', true);
         });
 
-    }(django.jQuery));
+    })(django.jQuery);
 }

admin_interface/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.12.1'
+__version__ = '0.12.2'

tox.ini

@@ -9,15 +9,15 @@ envlist =
 [testenv]
 passenv = CI TRAVIS TRAVIS_*
 deps =
-    dj17: Django >= 1.7, < 1.8
+    dj17: Django == 1.7.*
-    dj18: Django >= 1.8, < 1.9
+    dj18: Django == 1.8.*
-    dj19: Django >= 1.9, < 1.10
+    dj19: Django == 1.9.*
-    dj110: Django >= 1.10, < 1.11
+    dj110: Django == 1.10.*
-    dj111: Django >= 1.11, < 1.12
+    dj111: Django == 1.11.*
-    dj20: Django >= 2.0, < 2.1
+    dj20: Django == 2.0.*
-    dj21: Django >= 2.1, < 2.2
+    dj21: Django == 2.1.*
-    dj22: Django >= 2.2, < 2.3
+    dj22: Django == 2.2.*
-    dj30: Django >= 3.0, < 3.1
+    dj30: Django == 3.0.*
     djmaster: https://github.com/django/django/archive/master.tar.gz
     # mysql: mysqlclient
     postgres: psycopg2-binary