From fee0ba81b0efab70cde7eb26c7e8461c318420db Mon Sep 17 00:00:00 2001
From: Brandon Taylor <alsoicode@gmail.com>
Date: Fri, 5 Sep 2014 23:02:29 -0400
Subject: [PATCH] Moved logic to set sortable_foreign_key property to Sortable
 instead of SortableAdmin. Added instance methods to get next or previous
 instance, optionally filtered by a sortable foreign key field.

---
 adminsortable/admin.py                      |  10 +-----
 adminsortable/models.py                     |  32 +++++++++++++++++++-
 sample_project/database/test_project.sqlite | Bin 76800 -> 76800 bytes
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/adminsortable/admin.py b/adminsortable/admin.py
index 7ffdd70..cb0f16d 100644
--- a/adminsortable/admin.py
+++ b/adminsortable/admin.py
@@ -72,14 +72,6 @@ class SortableAdmin(SortableAdminBase, ModelAdmin):
     class Meta:
         abstract = True
 
-    def _get_sortable_foreign_key(self):
-        sortable_foreign_key = None
-        for field in self.model._meta.fields:
-            if isinstance(field, SortableForeignKey):
-                sortable_foreign_key = field
-                break
-        return sortable_foreign_key
-
     def get_urls(self):
         urls = super(SortableAdmin, self).get_urls()
         admin_urls = patterns('',
@@ -123,7 +115,7 @@ class SortableAdmin(SortableAdminBase, ModelAdmin):
         sortable_by_property = getattr(self.model, 'sortable_by', None)
 
         # `sortable_by` defined as a SortableForeignKey
-        sortable_by_fk = self._get_sortable_foreign_key()
+        sortable_by_fk = self.model.sortable_foreign_key
         sortable_by_class_is_sortable = get_is_sortable(objects)
 
         if sortable_by_property:
diff --git a/adminsortable/models.py b/adminsortable/models.py
index 49f56f6..ee43ee5 100644
--- a/adminsortable/models.py
+++ b/adminsortable/models.py
@@ -32,6 +32,7 @@ class Sortable(models.Model):
 
     # legacy support
     sortable_by = None
+    sortable_foreign_key = None
 
     class Meta:
         abstract = True
@@ -49,9 +50,13 @@ class Sortable(models.Model):
         for field in self._meta.fields:
             if isinstance(field, SortableForeignKey):
                 sortable_foreign_keys.append(field)
-        if len(sortable_foreign_keys) > 1:
+
+        sortable_foreign_keys_length = len(sortable_foreign_keys)
+        if sortable_foreign_keys_length > 1:
             raise MultipleSortableForeignKeyException(
                 u'{0} may only have one SortableForeignKey'.format(self))
+        elif sortable_foreign_keys_length == 1:
+            self.__class__.sortable_foreign_key = sortable_foreign_keys[0]
 
     def save(self, *args, **kwargs):
         if not self.id:
@@ -62,3 +67,28 @@ class Sortable(models.Model):
                 pass
 
         super(Sortable, self).save(*args, **kwargs)
+
+    def _filter_objects(self, filters, extra_filters):
+        if extra_filters:
+            filters.update(extra_filters)
+
+        if self.sortable_foreign_key:
+            # sfk_obj == sortable foreign key instance
+            sfk_obj = getattr(self, self.sortable_foreign_key.name)
+            filters.update(
+                {self.sortable_foreign_key.name: sfk_obj.id})
+
+        try:
+            obj = self._meta.model.objects.filter(**filters)[:1][0]
+        except IndexError:
+            obj = None
+
+        return obj
+
+    def get_next(self, extra_filters={}):
+        return self._filter_objects({'order__gt': self.order},
+            extra_filters)
+
+    def get_previous(self, extra_filters={}):
+        return self._filter_objects({'order__lt': self.order},
+            extra_filters)
diff --git a/sample_project/database/test_project.sqlite b/sample_project/database/test_project.sqlite
index 825ceae198965db57f5a7224f81e89aff5ac6984..98505cfdc228b6d5243b78dc9c0757822c6f89f5 100644
GIT binary patch
delta 596
zcmah`L2DC16rMM4lQ7n318WhC-BnDt3*9)oo9!mKMG<;1VAVq}6~%;-)zY|D&7ndo
zLQB0UQ}pIf5W<MX-{3`sYUsg>h#-Yp54B)Xr>!j>1P9)O$9v!Ry*J-<N1N_w508NH
zD0>==_T@{VUUK-L$=z}gmV;70<i$bPlW#*$&+24@P?P?IHV)x9JwqdW0YBg!eNHw+
z@7Yf71XdvmTb#Gtpb^$4Yw_(muNA$<t(Z^nD83W7ZdmeY^>ZF|SP-cxi^77;Xf-f;
zu>u}<3l1+i9{)?fz=L97NqKiTi8dBQ>i#grf&wkmgoX@kQJQ_FI$a_)HvnDIn|n`_
z2?Sua%slw2rE!@c&J&!+HhxjKDLk2jBmsxnc;U);^LpJp7f(d>tCObtr*7`l7EKc7
zfFoXtV>v=dw~D=|qv9~wA-W6pFV=6$UxFS^<EBzvA^06v@S9TnfXBBMqNpJ-l^9S(
zqwP}(agE?6uHm|x`-s~Yp<I^-nmr6w3BJas*g%sm(OG()8nCLymVoDNMk)*r8Z5p0
zX<MdwWge6RH}Cr)_g&`it+r_N!6(?Skr9GDbO26~5s}e``e(+hMD^Zi<$tC<dD9Kg
Vvj1{sW~^_UL0qevi;)eF>2F3$mT&+7

delta 334
zcmZp;!P0PpWr8%L&_o$$Mxl)fapocxx<*C{28LEfMplNVdIo0Zh8C8aFPR&ONC`8_
zGB7DH{bSt7?7^JN<jR!Ayp8cU<29x&lNEe!Ojck~-z@9<T#s3par0#M8uiVBEUk>2
zH`fNTF>5eePG)Zj1d2RlnrzvA8Ymz*nY}}2vuVdQrilR@n+3Z+uy8XlFfcK1U|_z*
zyaA|k2{We#6B`4gE~75f<eifhRaF?-7&vt~HG>m#3vyBw0*dmpQj<#*459o2Fn{y^
z$xIRulfE%9|6%?HH0c%d<a6iQ1elpQIk~`gpvi3hvzenngo8<*f%yXSJmySh1*WS^
z?My*T@<7e(Oxxwv7@sn7F*7<bFpDwiFggK6O&B>E)74mgn_?X&XZtE_&(dU^#smQV
Cv|V)o