Briq
/
django-admin-sortable-fixwin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed jQuery namespace on inline model JavaScript includes. 

Version bump to 1.6.5.
Updated readme.
master
Brandon Taylor 2014-02-12 16:22:04 -05:00
parent d5d6f54135
commit 53df734e15
6 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -1,6 +1,6 @@
# Django Admin Sortable # Django Admin Sortable
Current version: 1.6.4 Current version: 1.6.5
This project makes it easy to add drag-and-drop ordering to any model in This project makes it easy to add drag-and-drop ordering to any model in
Django admin. Inlines for a sortable model may also be made sortable, Django admin. Inlines for a sortable model may also be made sortable,
@ -308,8 +308,8 @@ ordering on top of that just seemed a little much in my opinion.
django-admin-sortable is currently used in production. django-admin-sortable is currently used in production.
### What's new in 1.6.4? ### What's new in 1.6.5?
- Added "sorting_filters" to specify a subset of model objects to be sorted. - Namespace fixes for jQuery in Django admin
### Future ### Future

2
adminsortable/__init__.py
View File

@ -1,4 +1,4 @@
VERSION = (1, 6, 4) # following PEP 386 VERSION = (1, 6, 5) # following PEP 386
DEV_N = None DEV_N = None

10
adminsortable/static/adminsortable/js/admin.sortable.stacked.inlines.js
View File

@ -6,7 +6,7 @@
var sortable_inline_rows = $('.inline-group .inline-related'); var sortable_inline_rows = $('.inline-group .inline-related');
sortable_inline_rows.addClass('sortable'); sortable_inline_rows.addClass('sortable');
jQuery('.inline-group').sortable({ $('.inline-group').sortable({
axis : 'y', axis : 'y',
containment : 'parent', containment : 'parent',
create: function(event, ui) { create: function(event, ui) {
@ -21,13 +21,12 @@
alert($('#localized_save_before_reorder_message').val()); alert($('#localized_save_before_reorder_message').val());
return false; return false;
} }
var indexes = []; var indexes = [];
ui.item.parent().children('.inline-related').each(function(i) ui.item.parent().children('.inline-related').each(function(i)
{ {
var index_value = $(this).find(':hidden[name$="-id"]').val(); var index_value = $(this).find(':hidden[name$="-id"]').val();
if (index_value !== "" && index_value !== undefined) if (index_value !== "" && index_value !== undefined) {
{
indexes.push(index_value); indexes.push(index_value);
} }
}); });
@ -36,8 +35,7 @@
url: ui.item.parent().find(':hidden[name="admin_sorting_url"]').val(), url: ui.item.parent().find(':hidden[name="admin_sorting_url"]').val(),
type: 'POST', type: 'POST',
data: { indexes : indexes.join(',') }, data: { indexes : indexes.join(',') },
success: function() success: function() {
{
ui.item.find('.form-row').effect('highlight', {}, 1000); ui.item.find('.form-row').effect('highlight', {}, 1000);
} }
}); });

16
adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js
View File

@ -5,29 +5,26 @@
{ {
var tabular_inline_rows = $('.tabular table tbody tr'); var tabular_inline_rows = $('.tabular table tbody tr');
tabular_inline_rows.addClass('sortable'); tabular_inline_rows.addClass('sortable');
jQuery('.tabular.inline-related').sortable({ $('.tabular.inline-related').sortable({
axis : 'y', axis : 'y',
containment : 'parent', containment : 'parent',
create: function(event, ui) create: function(event, ui) {
{
$('td.delete :checkbox').unbind(); $('td.delete :checkbox').unbind();
}, },
tolerance : 'pointer', tolerance : 'pointer',
items : 'tr:not(.add-row)', items : 'tr:not(.add-row)',
stop : function(event, ui) stop : function(event, ui) {
{
if ($('.inline-deletelink').length > 0) { if ($('.inline-deletelink').length > 0) {
$(ui.sender).sortable('cancel'); $(ui.sender).sortable('cancel');
alert($('#localized_save_before_reorder_message').val()); alert($('#localized_save_before_reorder_message').val());
return false; return false;
} }
var indexes = []; var indexes = [];
ui.item.parent().children('tr').each(function(i) ui.item.parent().children('tr').each(function(i)
{ {
var index_value = $(this).find('.original :hidden:first').val(); var index_value = $(this).find('.original :hidden:first').val();
if (index_value !== '' && index_value !== undefined) if (index_value !== '' && index_value !== undefined) {
{
indexes.push(index_value); indexes.push(index_value);
} }
}); });
@ -36,8 +33,7 @@
url: ui.item.parent().find(':hidden[name="admin_sorting_url"]').val(), url: ui.item.parent().find(':hidden[name="admin_sorting_url"]').val(),
type: 'POST', type: 'POST',
data: { indexes : indexes.join(',') }, data: { indexes : indexes.join(',') },
success: function() success: function() {
{
//highlight sorted row, then re-stripe table //highlight sorted row, then re-stripe table
ui.item.effect('highlight', {}, 1000); ui.item.effect('highlight', {}, 1000);
tabular_inline_rows.removeClass('row1 row2'); tabular_inline_rows.removeClass('row1 row2');

BIN
sample_project/database/test_project.sqlite
View File

Binary file not shown.

4
setup.py
View File

@ -12,8 +12,8 @@ setup(
long_description=README, long_description=README,
license='APL', license='APL',
author='Brandon Taylor', author='Brandon Taylor',
author_email='brandon@iambrandontaylor.com', author_email='alsoicode@gmail.com',
url='http://iambrandontaylor.com/', url='https://brandonftaylor.com/',
packages=find_packages(exclude=['sample_project']), packages=find_packages(exclude=['sample_project']),
zip_safe=False, zip_safe=False,
include_package_data=True, include_package_data=True,