From b6e68fa367c464a93e60c85cc71af68008268c7f Mon Sep 17 00:00:00 2001
From: Brandon Taylor <brandon@iambrandontaylor.com>
Date: Sat, 27 Apr 2013 13:10:53 -0400
Subject: [PATCH] Removed url template tags and put in relative paths for
 sorting urls for Django <= 1.4.x and Django 1.5.x compatibility.

---
 README.md                                     |   5 +++--
 adminsortable/__init__.py                     |   2 +-
 .../templates/adminsortable/change_list.html  |   8 ++++----
 .../adminsortable/edit_inline/stacked.html    |   2 +-
 .../adminsortable/edit_inline/tabular.html    |   2 +-
 .../adminsortable/shared/object_rep.html      |   2 +-
 sample_project/database/test_project.sqlite   | Bin 54272 -> 56320 bytes
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index e8ce892..fb59ca8 100644
--- a/README.md
+++ b/README.md
@@ -162,8 +162,9 @@ 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.3?
-- Reverted changes that broke getting the sorting url for inlines
+### What's new in 1.4.4?
+- Decided to go with the simplest approach to add the sorting urls to inlines
+for Django <= 1.4 and Django 1.5.x support
 
 
 ### Future
diff --git a/adminsortable/__init__.py b/adminsortable/__init__.py
index d2756ca..07cf343 100755
--- a/adminsortable/__init__.py
+++ b/adminsortable/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 4, 3)  # following PEP 386
+VERSION = (1, 4, 4)  # following PEP 386
 DEV_N = None
 
 
diff --git a/adminsortable/templates/adminsortable/change_list.html b/adminsortable/templates/adminsortable/change_list.html
index 6e1e7a0..6af21fd 100644
--- a/adminsortable/templates/adminsortable/change_list.html
+++ b/adminsortable/templates/adminsortable/change_list.html
@@ -45,10 +45,10 @@
 		{% block object-tools %}
 	        <ul class="object-tools">
 	            <li>
-                        <a href="../">
-                        {% blocktrans with opts.verbose_name_plural|capfirst as model %}Return to {{ model }}{% endblocktrans %}
-                        </a>
-                    </li>
+                    <a href="../">
+                    {% blocktrans with opts.verbose_name_plural|capfirst as model %}Return to {{ model }}{% endblocktrans %}
+                    </a>
+                </li>
 	        </ul>
 	    {% endblock %}
 		{% if objects %}
diff --git a/adminsortable/templates/adminsortable/edit_inline/stacked.html b/adminsortable/templates/adminsortable/edit_inline/stacked.html
index 3c09065..aaea0fc 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="{% url admin:admin_do_sorting inline_admin_form.original.model_type_id %}" />
+  <input type="hidden" name="admin_sorting_url" value="../sorting/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 6de7360..ac8802a 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="{% url admin:admin_do_sorting inline_admin_form.original.model_type_id %}" />
+          <input type="hidden" name="admin_sorting_url" value="../sorting/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 01377c2..6e898da 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="{% url admin:admin_do_sorting object.model_type_id %}" class="admin_sorting_url">{{ object }}</a>
+<a href="../sorting/do-sorting/{{ object.model_type_id }}/" class="admin_sorting_url">{{ object }}</a>
diff --git a/sample_project/database/test_project.sqlite b/sample_project/database/test_project.sqlite
index 3e632311cd806f67aa36c692a392e6ccf1f42bb1..fd926983c8009cb5585508e1e809f829342e4ff4 100644
GIT binary patch
delta 756
zcmah{T}TvB7`^wN8F$CoUEEqTvtk}34APu+XJ^-f*q1ba64J*A*L6hGG?$PfVx5p4
z0?}<AM39U`2%?8=9_(ciG6;I<4<ULmiU^V-F<D^^?T$WFAauEW-1~j!JNKN+H~av@
zPcU94<_IBrS~*2?nf42MAXFLD6*XL|MQYV(RX9`~)HVB!URC51Ignz5N1|iH_IrN7
zOTw-~+#w>{By7`mH?6Uw<!GjASHdvVpcabObamDwBAwBiNN2(bb!frrkdX+<4#=9W
zSM0i$?6D#d2EkK&#0*AY;B>~+V0EXC6l;~L`bUf&35K<(Y>%XFc)VN%Fi)_Ec`Vz0
zVG05k$v$gx?4-RswqFRmCoXh=@4I-6=lG7>xSBDWAO&avp;B3?X!TB<Xk(2=GTGA>
zzt%U9+ykdlQYy5@lkx7I9Q;B7k$Cc)(cd56$?>=MI^Xcu@{3MuaVZ+&y@s8ic<G|d
zdNEx=VgH==xp(BQ5ah6eJeRu!>)V36fH6Rl?EFK&Th8Mv*6<ncu*3mbSa0WwOGFWr
zLKGlT!8r<WBD1&VJnny}WX{B?w&C{H0uy9>A`G(xvv|h&CJ{U27}u%9TH}{4_Zdo^
z(QhPs63W?uD~6&<2N^fY%ez&B68CyI9XsGD#4k>}O0bSqPWuHu0i4ni$T&v0|4Q&}
zyQQOqj<Q>DWy}<Hn?r)weDiwD8f;Ol<BhLfDN$@Ty)o+pzdvd?Z;hQ<m%V5wj1CfZ
lky`%pne_NVg*hZ|_x*38IA=Dn+qhU0^*MnHyO%bnegm))#nJ!(

delta 579
zcmZ{gUr19?9LLW&-+R3~&aEa}HY~azRA36*v^66l3Zk-%96m*KjZ2xf#dQz)GzZc{
zRCAq&K}15mgjO)mgS|x2=*1q2(vl!U=_U1{KUOpXJDWvMou?n4-{<`P4L-o&9Sqm&
zQ-qM#oVlA$6;7Ur`Xf!@Rx{Mn))Hz9#hN4Acf=ww`7+wPw$`IWjpPXoc9C9D!LD4U
ziP59EOqV$O_Pa3N{4~<KemLXVBi?tI;@<1yB0K%VRgG&zLj#f3?aM4TyhS#2%x&{(
z7$SIrIo!q&>_Vms;y`+{yqfN>@nD(&qXdsJiUsM@Za_TBHU?Dx0B?-j{V8*=m9kGK
zodGi}7qaU${|qtE&CrdTSi)0`;}R|uGVS1gT16<Y4{D+}zcY?Qw&V1~t%1Iz<I~HT
zK#(1@dhI_*t0J7&1&`T@gtdxPPd`;i@3b82%qpuz`R89IOZn#pg_s=KN}2pR;&plO
zP0hbZ@EMCJsrlbwjSfl~12|U|btX$=K9~C=O89_f%wSeo4<TMn1nRVks%zl166z=e
z$d!p2m-0U;a~5K0%;ko9oL6+YQe>K2m1Zas%%doMm#<^rJlRB}l(SCj-1$D++;1mr
rr{|P;B$=|!&_<@#_+K{6H>k^Tl@|A(tsB4l1z!9j`oA@9z0iIG*uS8W