From 33074d8f65bc6e4c8d983f919f86cabe5f3e3e38 Mon Sep 17 00:00:00 2001 From: Patrick Date: Thu, 10 Mar 2016 14:43:44 -0500 Subject: [PATCH 1/4] js: fix indexes finding for tabular inlines js: fix indexes finding for tabular inlines Not sure with but unless I change the code the line 30 finds tags instead of the input. --- .../static/adminsortable/js/admin.sortable.tabular.inlines.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js b/adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js index debd654..b39190d 100644 --- a/adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js +++ b/adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js @@ -27,7 +27,7 @@ var indexes = []; ui.item.parent().children('tr').each(function(i) { - var index_value = $(this).find('.original :hidden:first').val(); + var index_value = $(this).find('.original').find(':input').first().val(); if (index_value !== '' && index_value !== undefined) { indexes.push(index_value); } From be29289d302f6393e07db7afd9b7784477d5db72 Mon Sep 17 00:00:00 2001 From: Brandon Taylor Date: Mon, 14 Mar 2016 11:40:25 -0400 Subject: [PATCH 2/4] Bumping version due to PyPi error during upload. --- README.md | 4 ++-- README.rst | 4 ++-- adminsortable/__init__.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2daffcb..a325786 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/iambrandontaylor/django-admin-sortable.svg?branch=master)](https://travis-ci.org/iambrandontaylor/django-admin-sortable) -Current version: 2.0.14 +Current version: 2.0.15 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, @@ -496,7 +496,7 @@ ordering on top of that just seemed a little much in my opinion. ### Status django-admin-sortable is currently used in production. -### What's new in 2.0.14? +### What's new in 2.0.15? - Refactored exception handling when determining `order_field_name` ### Future diff --git a/README.rst b/README.rst index c05110c..adb19f6 100644 --- a/README.rst +++ b/README.rst @@ -3,7 +3,7 @@ Django Admin Sortable |Build Status| -Current version: 2.0.14 +Current version: 2.0.15 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, @@ -612,7 +612,7 @@ Status django-admin-sortable is currently used in production. -What's new in 2.0.14? +What's new in 2.0.15? ~~~~~~~~~~~~~~~~~~~~~ - Refactored exception handling when determining ``order_field_name`` diff --git a/adminsortable/__init__.py b/adminsortable/__init__.py index 00971ab..cbbc575 100644 --- a/adminsortable/__init__.py +++ b/adminsortable/__init__.py @@ -1,4 +1,4 @@ -VERSION = (2, 0, 14) +VERSION = (2, 0, 15) DEV_N = None From fb6e1118dbb37a82a2f3a366c3803b876f1a68a9 Mon Sep 17 00:00:00 2001 From: Venelin Stoykov Date: Wed, 15 Jun 2016 16:54:07 +0300 Subject: [PATCH 3/4] Simplify SortableAdmin.get_urls Preserve compatibility --- adminsortable/admin.py | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/adminsortable/admin.py b/adminsortable/admin.py index 303d846..bb53926 100755 --- a/adminsortable/admin.py +++ b/adminsortable/admin.py @@ -4,12 +4,11 @@ from django import VERSION from django.conf import settings -if VERSION > (1, 7): +try: from django.conf.urls import url -elif VERSION > (1, 5): - from django.conf.urls import patterns, url -else: - from django.conf.urls.defaults import patterns, url +except ImportError: + # Django < 1.4 + from django.conf.urls.defaults import url from django.contrib.admin import ModelAdmin, TabularInline, StackedInline from django.contrib.admin.options import InlineModelAdmin @@ -94,17 +93,11 @@ class SortableAdmin(SortableAdminBase, ModelAdmin): self.admin_site.admin_view(self.sort_view), name='admin_sort') - if VERSION > (1, 7): - admin_urls = [ - admin_do_sorting_url, - admin_sort_url - ] - else: - admin_urls = patterns('', - admin_do_sorting_url, - admin_sort_url,) - - return admin_urls + urls + urls = [ + admin_do_sorting_url, + admin_sort_url + ] + urls + return urls def sort_view(self, request): """ From 7c235308b81f4cfc010be4fa49d1384b94f2eb89 Mon Sep 17 00:00:00 2001 From: Venelin Stoykov Date: Wed, 15 Jun 2016 17:53:35 +0300 Subject: [PATCH 4/4] Fix UI when djangocms-admin-style is used --- adminsortable/static/adminsortable/js/admin.sortable.js | 2 +- adminsortable/templates/adminsortable/shared/object_rep.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/adminsortable/static/adminsortable/js/admin.sortable.js b/adminsortable/static/adminsortable/js/admin.sortable.js index cca28cb..772cc62 100644 --- a/adminsortable/static/adminsortable/js/admin.sortable.js +++ b/adminsortable/static/adminsortable/js/admin.sortable.js @@ -24,7 +24,7 @@ { // set icons based on position lineItems.each(function(index, element) { - var icon = $(element).find('> a .fa'); + var icon = $(element).find('a.admin_sorting_url .fa'); icon.removeClass('fa-sort-desc fa-sort-asc fa-sort'); if (index === 0) { diff --git a/adminsortable/templates/adminsortable/shared/object_rep.html b/adminsortable/templates/adminsortable/shared/object_rep.html index ffe9edf..15654c0 100644 --- a/adminsortable/templates/adminsortable/shared/object_rep.html +++ b/adminsortable/templates/adminsortable/shared/object_rep.html @@ -2,5 +2,5 @@
+ {{ object }}
- {{ object }}