From 8f64f6ea762264bff0aa8cf20766175a8de6cc53 Mon Sep 17 00:00:00 2001 From: Brandon Taylor Date: Mon, 23 Sep 2013 08:41:10 -0400 Subject: [PATCH] Bumped version to 1.5.5. Fixed namespacing of so sorting urls. Changed namespacing of sortable() calls. Removed unit test to check for javascript include template, which has been eliminated. --- README.md | 15 ++++----------- adminsortable/__init__.py | 2 +- .../static/adminsortable/js/admin.sortable.js | 2 +- .../js/admin.sortable.stacked.inlines.js | 2 +- .../js/admin.sortable.tabular.inlines.js | 2 +- .../adminsortable/edit_inline/stacked.html | 2 +- .../adminsortable/edit_inline/tabular.html | 2 +- .../adminsortable/shared/object_rep.html | 2 +- sample_project/app/tests.py | 4 ---- sample_project/database/test_project.sqlite | Bin 69632 -> 70656 bytes 10 files changed, 11 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 3a69e43..af1789d 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,6 @@ 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, enabling individual items or groups of items to be sortable. -## Requirements -jQuery - ## Supported Django Versions If you're using Django 1.4.x, use django-admin-sortable 1.4.9 or below. For Django 1.5.x, use the latest version of django-admin-sortable. @@ -231,18 +228,14 @@ ordering on top of that just seemed a little much in my opinion. django-admin-sortable is currently used in production. -### What's new in 1.5.4? -- Eliminated loading jQuery and jQueryUI from external CDNs. -- All jQuery-based JavaScript code now leverages the django.jQuery namespace and version of jQuery included in Django Admin. -- Eliminated needing to include jQueryUI effects core to do highlighting on drag complete. -- Added CSRF protection to sort views (thanks @dokterbob) -- Static includes now leverage {% static %} template tag. +### What's new in 1.5.5? +- Improved url resolution to sorting urls +- Fixed a potential issue with JavaScript namespace on sortable() calls that could prevent sortable from working in environments where jQuery is already included, such as Django-CMS ### Future - Support for foreign keys that are self referential -- More unit tests -- Move unit tests out of sample project +- Move unit tests out of sample project (I could really use some help with this one) - Travis CI integration diff --git a/adminsortable/__init__.py b/adminsortable/__init__.py index 4ac7174..7195d58 100755 --- a/adminsortable/__init__.py +++ b/adminsortable/__init__.py @@ -1,4 +1,4 @@ -VERSION = (1, 5, 4) # following PEP 386 +VERSION = (1, 5, 5) # following PEP 386 DEV_N = None diff --git a/adminsortable/static/adminsortable/js/admin.sortable.js b/adminsortable/static/adminsortable/js/admin.sortable.js index 697d835..b854f52 100644 --- a/adminsortable/static/adminsortable/js/admin.sortable.js +++ b/adminsortable/static/adminsortable/js/admin.sortable.js @@ -1,7 +1,7 @@ (function($){ $(function() { - $('.sortable').sortable({ + jQuery('.sortable').sortable({ axis : 'y', containment : 'parent', tolerance : 'pointer', diff --git a/adminsortable/static/adminsortable/js/admin.sortable.stacked.inlines.js b/adminsortable/static/adminsortable/js/admin.sortable.stacked.inlines.js index ec14154..74097e5 100644 --- a/adminsortable/static/adminsortable/js/admin.sortable.stacked.inlines.js +++ b/adminsortable/static/adminsortable/js/admin.sortable.stacked.inlines.js @@ -6,7 +6,7 @@ var sortable_inline_rows = $('.inline-group .inline-related'); sortable_inline_rows.addClass('sortable'); - $('.inline-group').sortable({ + jQuery('.inline-group').sortable({ axis : 'y', containment : 'parent', create: 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 97194a8..a97cd5f 100644 --- a/adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js +++ b/adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js @@ -5,7 +5,7 @@ { var tabular_inline_rows = $('.tabular table tbody tr'); tabular_inline_rows.addClass('sortable'); - $('.tabular.inline-related').sortable({ + jQuery('.tabular.inline-related').sortable({ axis : 'y', containment : 'parent', create: function(event, ui) diff --git a/adminsortable/templates/adminsortable/edit_inline/stacked.html b/adminsortable/templates/adminsortable/edit_inline/stacked.html index 0516298..bc7ce69 100644 --- a/adminsortable/templates/adminsortable/edit_inline/stacked.html +++ b/adminsortable/templates/adminsortable/edit_inline/stacked.html @@ -17,7 +17,7 @@ {% if inline_admin_form.has_auto_field %}{{ inline_admin_form.pk_field.field }}{% endif %} {{ inline_admin_form.fk_field.field }} {% if inline_admin_form.original %} - + {% endif %} {% endfor %} diff --git a/adminsortable/templates/adminsortable/edit_inline/tabular.html b/adminsortable/templates/adminsortable/edit_inline/tabular.html index 5953908..34555ee 100644 --- a/adminsortable/templates/adminsortable/edit_inline/tabular.html +++ b/adminsortable/templates/adminsortable/edit_inline/tabular.html @@ -41,7 +41,7 @@ {% endfor %} {% endspaceless %} {% if inline_admin_form.original %} - + {% endif %} {% for fieldset in inline_admin_form %} diff --git a/adminsortable/templates/adminsortable/shared/object_rep.html b/adminsortable/templates/adminsortable/shared/object_rep.html index 6e898da..05dfb16 100644 --- a/adminsortable/templates/adminsortable/shared/object_rep.html +++ b/adminsortable/templates/adminsortable/shared/object_rep.html @@ -3,4 +3,4 @@
-{{ object }} +{{ object }} diff --git a/sample_project/app/tests.py b/sample_project/app/tests.py index 31badde..2a50495 100644 --- a/sample_project/app/tests.py +++ b/sample_project/app/tests.py @@ -102,10 +102,6 @@ class SortableTestCase(TestCase): template_names = [t.name for t in response.templates] self.assertTrue('adminsortable/change_list.html' in template_names, 'adminsortable/change_list.html was not rendered') - self.assertTrue('adminsortable/shared/javascript_includes.html' - in template_names, - 'JavaScript includes for adminsortable change list ' - 'were not rendered') def test_adminsortable_change_list_sorting_fails_if_not_ajax(self): logged_in = self.client.login(username=self.user.username, diff --git a/sample_project/database/test_project.sqlite b/sample_project/database/test_project.sqlite index 5b6876e96864e8aeb5765680d9f97cd04f36ee3c..2e83ece5d19d002271b6c81a40e0983568ec754d 100644 GIT binary patch delta 1131 zcmah|Uuaup6#u^S`*NEb+MA^52pH-v`(uTJ(A?o<3c`dUDn5)cH_E`VGMxst3f)5s>iH7dO%V1y9Qc0s zcYf!0zI)Em)9UDF>Vs5hUI;OG!hTxLFCILY>2y8YaR)qqpwH_~I~lJp9bC@1v6w=G ziDD2NxQ|sdg1A}+J@;5`^`*oPOD+ns>2JA+7f_@@nvxsxDxIh6*okFYz?V#aPrkSd zL()AmK9etw`*XR8$+3y_*j!<@zyI)?)v3&p{9JZ?wp)|(Gj6rwkNTyt(i?rH{Gr!9 z|4=nk@SUm5VZV~krh<(jvv-F@!vdFZ6QAN882fT@7CwEJK%b~*{q*U`>Ejge5E7GeJh+1xPou-2hOnO zyO2-Sjx9XtCP)c$&nvl7*?xAkoXbzoR&BRSDk1mazo^p%jZ(0>5LebGtoX5kukks4 z#El^K;RN17U3BUPRIQ zGngO~$+j&BR8dG(3FW_m2bBN8d$?^tOv2L ze!?!?7ZD*iHq*%1sCW7r)K5!211X zwn@#d3>`xu9hG7~F!k?g*+jh&wJ$`&GA=LJ9r9PQv}d9&fe3ZUi|qLe`O#9leC>(u v(9qkJ1CLs{+P+_2t}R?I?%!I1*8aD4*#UJTb(#)x^%{QIH-%3_Ef63TeW!tMJ+q8ULuUB?VQIOh0k>{DgkrEZrFkjjtm zOjmNYiz!$X4W$Pwq@HIKK942LJLc23s4fzUYN2C8bu{=EpY$GOqOsfrmtL&X=&Ovh ztJtKt3-E851BOwgIh!xsmV1%u80468Jj*x0g+25+vENIpHY(3_o$p9ytg0xn{mS|8 z@u`(pV!Isk(66gwhT|s(^b