Fix issue with sorting of non-polymorphic inlines in polymorphic inlines

theatlantic · Apr 3, 2019 · da0b800 · da0b800
1 parent ae19a68
commit da0b800
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 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/sortable.js b/nested_admin/static/nested_admin/src/nested-admin/sortable.js
@@ -161,7 +161,7 @@ function createSortable($group) {
  },
  helper: 'clone',
  opacity: 0.6,
- maxLevels: 3,
+ maxLevels: 0,
  connectWith: '.djn-items',
  tolerance: 'intersection',
  // Don't allow dragging beneath an inline that is marked for deletion
@@ -172,7 +172,7 @@ function createSortable($group) {
  if (isPolymorphic) {
  const childModels = parentItem.closest('.djn-group').data('inlineFormset').nestedOptions.childModels;
  const inlineModel = currentItem.data('inlineModel');
- if (childModels.indexOf(inlineModel) === -1) {
+ if (childModels && childModels.indexOf(inlineModel) === -1) {
  return false;
  }
  }

diff --git a/nested_admin/tests/settings.py b/nested_admin/tests/settings.py
@@ -53,6 +53,7 @@
  'DIRS': selenosis.settings.TEMPLATES[0]['DIRS'],
  'APP_DIRS': True,
  'OPTIONS': {
+ 'debug': True,
  'string_if_invalid': 'INVALID {{ %s }}',
  'context_processors': [
  'django.contrib.auth.context_processors.auth',