From 373197553e3462eb53ac8acaf3768ba631f825d7 Mon Sep 17 00:00:00 2001
From: Brandon Taylor <btaylorweb@gmail.com>
Date: Fri, 26 Apr 2013 13:30:42 -0400
Subject: [PATCH] Reverted changes that added get_sort_url template tag, as
 this caused an exception error with inlines.

---
 README.md                                                 | 4 ++--
 adminsortable/__init__.py                                 | 2 +-
 adminsortable/admin.py                                    | 6 +++---
 .../templates/adminsortable/edit_inline/stacked.html      | 2 +-
 .../templates/adminsortable/edit_inline/tabular.html      | 2 +-
 .../templates/adminsortable/shared/object_rep.html        | 2 +-
 adminsortable/templatetags/adminsortable_tags.py          | 8 --------
 7 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 039ba1c..e8ce892 100644
--- a/README.md
+++ b/README.md
@@ -162,8 +162,8 @@ 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.4.2?
-- Unicode support for the sort view title (thanks @knyazz)
+### What's new in 1.4.3?
+- Reverted changes that broke getting the sorting url for inlines
 
 
 ### Future
diff --git a/adminsortable/__init__.py b/adminsortable/__init__.py
index 56dc381..d2756ca 100755
--- a/adminsortable/__init__.py
+++ b/adminsortable/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 4, 2)  # following PEP 386
+VERSION = (1, 4, 3)  # following PEP 386
 DEV_N = None
 
 
diff --git a/adminsortable/admin.py b/adminsortable/admin.py
index 3bb2ddc..6913d90 100644
--- a/adminsortable/admin.py
+++ b/adminsortable/admin.py
@@ -72,11 +72,11 @@ class SortableAdmin(ModelAdmin):
             # this view changes the order
             url(r'^sorting/do-sorting/(?P<model_type_id>\d+)/$',
                 self.admin_site.admin_view(self.do_sorting_view),
-                name='{0}_do_sorting'.format(self.model._meta.app_label)),
+                name='admin_do_sorting'),
 
             # this view shows a link to the drag-and-drop view
             url(r'^sort/$', self.admin_site.admin_view(self.sort_view),
-                name='{0}_sort'.format(self.model._meta.app_label)),
+                name='admin_sort'),
         )
         return admin_urls + urls
 
@@ -142,7 +142,7 @@ class SortableAdmin(ModelAdmin):
             verbose_name_plural = opts.verbose_name_plural
 
         context = {
-            'title': u'Drag and drop {0} to change display order'.format(
+            'title': 'Drag and drop {0} to change display order'.format(
                 capfirst(verbose_name_plural)),
             'opts': opts,
             'app_label': opts.app_label,
diff --git a/adminsortable/templates/adminsortable/edit_inline/stacked.html b/adminsortable/templates/adminsortable/edit_inline/stacked.html
index 7145286..3c09065 100644
--- a/adminsortable/templates/adminsortable/edit_inline/stacked.html
+++ b/adminsortable/templates/adminsortable/edit_inline/stacked.html
@@ -16,7 +16,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 %}
-  <input type="hidden" name="admin_sorting_url" value="{% get_do_sorting_url inline_admin_form.original %}" />
+  <input type="hidden" name="admin_sorting_url" value="{% url admin:admin_do_sorting inline_admin_form.original.model_type_id %}" />
   {% endif %}
 </div>{% endfor %}
 </div>
diff --git a/adminsortable/templates/adminsortable/edit_inline/tabular.html b/adminsortable/templates/adminsortable/edit_inline/tabular.html
index 9855af9..6de7360 100644
--- a/adminsortable/templates/adminsortable/edit_inline/tabular.html
+++ b/adminsortable/templates/adminsortable/edit_inline/tabular.html
@@ -40,7 +40,7 @@
           {% endfor %}
           {% endspaceless %}
           {% if inline_admin_form.original %}
-          <input type="hidden" name="admin_sorting_url" value="{% get_do_sorting_url inline_admin_form.original %}" />
+          <input type="hidden" name="admin_sorting_url" value="{% url admin:admin_do_sorting inline_admin_form.original.model_type_id %}" />
           {% endif %}
         </td>
         {% 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 7550350..01377c2 100644
--- a/adminsortable/templates/adminsortable/shared/object_rep.html
+++ b/adminsortable/templates/adminsortable/shared/object_rep.html
@@ -3,4 +3,4 @@
 <form>
     <input name="pk" type="hidden" value="{{ object.pk }}" />
 </form>
-<a href="{% get_do_sorting_url object %}" class="admin_sorting_url">{{ object }}</a>
+<a href="{% url admin:admin_do_sorting object.model_type_id %}" class="admin_sorting_url">{{ object }}</a>
diff --git a/adminsortable/templatetags/adminsortable_tags.py b/adminsortable/templatetags/adminsortable_tags.py
index 7995858..aae2b6c 100644
--- a/adminsortable/templatetags/adminsortable_tags.py
+++ b/adminsortable/templatetags/adminsortable_tags.py
@@ -1,6 +1,4 @@
 from django import template
-from django import VERSION as DJANGO_VERSION
-from django.core.urlresolvers import reverse
 
 register = template.Library()
 
@@ -35,9 +33,3 @@ def render_object_rep(context, obj,
     context.update({'object': obj})
     tmpl = template.loader.get_template(sortable_object_rep_template)
     return tmpl.render(context)
-
-
-@register.simple_tag(takes_context=False)
-def get_do_sorting_url(obj):
-    return reverse('admin:{0}_do_sorting'.format(obj._meta.app_label),
-            kwargs={'model_type_id': obj.model_type_id()})