Version bump to 2.1.9

Updated readme.
Added filter_kwargs as a replacement to extra_filters.
This commit is contained in:
Brandon Taylor
2018-10-10 14:02:11 -04:00
parent fabd78e5be
commit b1258afcea
4 changed files with 42 additions and 17 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
VERSION = (2, 1, 8)
VERSION = (2, 1, 9)
DEV_N = None
+16 -5
View File
@@ -100,10 +100,15 @@ class SortableMixin(models.Model):
super(SortableMixin, self).save(*args, **kwargs)
def _filter_objects(self, filters, filter_args, extra_filters, filter_on_sortable_fk):
def _filter_objects(self, filters, filter_args, extra_filters, filter_kwargs, filter_on_sortable_fk):
# DEPRECATION WARNING: `extra_filters` will be replaced by `filter_kwargs` in the next release
if extra_filters:
filters.update(extra_filters)
if filter_kwargs:
filters.update(filter_kwargs)
if self.sortable_foreign_key and filter_on_sortable_fk:
# sfk_obj == sortable foreign key instance
sfk_obj = getattr(self, self.sortable_foreign_key.name)
@@ -119,17 +124,23 @@ class SortableMixin(models.Model):
return obj
def get_next(self, filter_args=[], extra_filters={}, filter_on_sortable_fk=True):
def get_next(self, filter_args=[], extra_filters={}, filter_kwargs={}, filter_on_sortable_fk=True):
return self._filter_objects(
{'{0}__gt'.format(self.order_field_name): self._get_order_field_value()},
filter_args,
extra_filters, filter_on_sortable_fk)
extra_filters,
filter_kwargs,
filter_on_sortable_fk
)
def get_previous(self, filter_args=[], extra_filters={}, filter_on_sortable_fk=True):
def get_previous(self, filter_args=[], extra_filters={}, filter_kwargs={}, filter_on_sortable_fk=True):
return self._filter_objects(
{'{0}__lt'.format(self.order_field_name): self._get_order_field_value()},
filter_args,
extra_filters, filter_on_sortable_fk)
extra_filters,
filter_kwargs,
filter_on_sortable_fk
)
# for legacy support of existing implementations