Merge pull request #40 from sbussetti/master

prevent duplication of lookup anchors as additional nested elements with GFKs are added
theatlantic · May 9, 2016 · f211076 · f211076
2 parents 4a310e7 + 125890c
commit f211076
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/nested_admin/static/nested_admin/dist/nested_admin.js b/nested_admin/static/nested_admin/dist/nested_admin.js
diff --git a/nested_admin/static/nested_admin/dist/nested_admin.js.map b/nested_admin/static/nested_admin/dist/nested_admin.js.map
diff --git a/nested_admin/static/nested_admin/dist/nested_admin.min.js b/nested_admin/static/nested_admin/dist/nested_admin.min.js
diff --git a/nested_admin/static/nested_admin/dist/nested_admin.min.js.map b/nested_admin/static/nested_admin/dist/nested_admin.min.js.map
diff --git a/nested_admin/static/nested_admin/src/nested-admin/utils.js b/nested_admin/static/nested_admin/src/nested-admin/utils.js
@@ -67,11 +67,13 @@ DJNesting.initRelatedFields = function(prefix, groupData) {
     var lookupFields = groupData.lookupRelated;
 
     $.each(lookupFields.fk || [], function() {
+        if ($(this).next('a').hasClass('related-lookup')) return;
         $('#' + prefix + '-group > .djn-items > *:not(.djn-empty-form)')
         .find('input[name^="' + prefix + '"][name$="' + this + '"]')
         .grp_related_fk({lookup_url: lookupUrls.related});
     });
     $.each(lookupFields.m2m || [], function() {
+        if ($(this).next('a').hasClass('related-lookup')) return;
         $('#' + prefix + '-group > .djn-items > *:not(.djn-empty-form)')
         .find('input[name^="' + prefix + '"][name$="' + this + '"]')
         .grp_related_m2m({lookup_url: lookupUrls.m2m});
@@ -82,6 +84,7 @@ DJNesting.initRelatedFields = function(prefix, groupData) {
         .find('input[name^="' + prefix + '"][name$="' + objectId + '"]')
         .each(function() {
             var $this = $(this);
+            if ($this.next('a').hasClass('related-lookup')) return;
             var id = $this.attr('id');
             var idRegex = new RegExp('(\\-\\d+\\-)' + objectId + '$');
             var [, index] = id.match(idRegex) || [];