diff --git a/adminsortable/static/adminsortable/js/admin.sortable.js b/adminsortable/static/adminsortable/js/admin.sortable.js index 3f1a449..bd9c024 100644 --- a/adminsortable/static/adminsortable/js/admin.sortable.js +++ b/adminsortable/static/adminsortable/js/admin.sortable.js @@ -14,7 +14,11 @@ jQuery(function($){ $.ajax({ url: ui.item.find('a.admin_sorting_url').attr('href'), type: 'POST', - data: { indexes: indexes.join(',') } + data: { indexes: indexes.join(',') }, + success: function() + { + ui.item.effect('highlight', {}, 1000); + } }); } }).click(function(e){ diff --git a/adminsortable/static/adminsortable/js/admin.sortable.stacked.inlines.js b/adminsortable/static/adminsortable/js/admin.sortable.stacked.inlines.js index 539100e..2fb3a5b 100644 --- a/adminsortable/static/adminsortable/js/admin.sortable.stacked.inlines.js +++ b/adminsortable/static/adminsortable/js/admin.sortable.stacked.inlines.js @@ -3,9 +3,13 @@ jQuery(function($){ { var sortable_inline_rows = $('.inline-group .inline-related'); sortable_inline_rows.addClass('sortable'); + $('.inline-group').sortable({ axis : 'y', containment : 'parent', + create: function(event, ui) { + $('.inline-related :checkbox').unbind(); + }, tolerance : 'pointer', items : '.inline-related', stop : function(event, ui) diff --git a/adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js b/adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js index ae032df..1b4dfdf 100644 --- a/adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js +++ b/adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js @@ -6,6 +6,10 @@ jQuery(function($){ $('.tabular.inline-related').sortable({ axis : 'y', containment : 'parent', + create: function(event, ui) + { + $('td.delete :checkbox').unbind(); + }, tolerance : 'pointer', items : 'tr:not(.add-row)', stop : function(event, ui) diff --git a/adminsortable/templates/adminsortable/change_form.html b/adminsortable/templates/adminsortable/change_form.html index e54840a..36d074c 100644 --- a/adminsortable/templates/adminsortable/change_form.html +++ b/adminsortable/templates/adminsortable/change_form.html @@ -7,11 +7,14 @@ {% url 'admin:jsi18n' as jsi18nurl %} {% if has_sortable_tabular_inlines or has_sortable_stacked_inlines %} - {% include sortable_javascript_includes_template %} + {% include sortable_javascript_includes_template with inlines=True %} {% endif %} {% if has_sortable_tabular_inlines %} {% endif %} + {% if has_sortable_stacked_inlines %} + + {% endif %} {% if has_sortable_stacked_inlines %} {% endif %} diff --git a/adminsortable/templates/adminsortable/change_list.html b/adminsortable/templates/adminsortable/change_list.html index 6af21fd..6cb3e7e 100644 --- a/adminsortable/templates/adminsortable/change_list.html +++ b/adminsortable/templates/adminsortable/change_list.html @@ -9,6 +9,7 @@ {% block extrahead %} {{ block.super }} {% include sortable_javascript_includes_template %} + {% endblock %} {% block breadcrumbs %} diff --git a/adminsortable/templates/adminsortable/shared/javascript_includes.html b/adminsortable/templates/adminsortable/shared/javascript_includes.html index b88fd64..fdfec34 100644 --- a/adminsortable/templates/adminsortable/shared/javascript_includes.html +++ b/adminsortable/templates/adminsortable/shared/javascript_includes.html @@ -1,4 +1,2 @@ - - - - + + diff --git a/sample_project/database/test_project.sqlite b/sample_project/database/test_project.sqlite index 5c6bc27..b2c8309 100644 Binary files a/sample_project/database/test_project.sqlite and b/sample_project/database/test_project.sqlite differ