Briq
/
django-admin-sortable-fixwin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor PEP8, text and formatting tweaks.

master
Brandon Taylor 2015-08-24 08:18:22 -04:00
parent 64b8b9dc39
commit 6c5a9058fe
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
adminsortable/admin.py
View File

@ -284,7 +284,8 @@ class SortableInlineBase(SortableAdminBase, InlineModelAdmin):
if not issubclass(self.model, SortableMixin): if not issubclass(self.model, SortableMixin):
raise Warning(u'Models that are specified in SortableTabluarInline' raise Warning(u'Models that are specified in SortableTabluarInline'
' and SortableStackedInline must inherit from SortableMixin') ' and SortableStackedInline must inherit from SortableMixin'
' (or Sortable for legacy implementations)')
def get_queryset(self, request): def get_queryset(self, request):
if VERSION < (1, 6): if VERSION < (1, 6):

15
adminsortable/models.py
View File

@ -74,7 +74,11 @@ class SortableMixin(models.Model):
self.__class__.sortable_foreign_key = sortable_foreign_keys[0] self.__class__.sortable_foreign_key = sortable_foreign_keys[0]
def _get_order_field_value(self): def _get_order_field_value(self):
return int(self.order_field.value_to_string(self)) try:
return int(self.order_field.value_to_string(self))
except ValueError:
raise u'The value from the specified order field could not be '
'typecast to an integer.'
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
if not self.id: if not self.id:
@ -99,8 +103,9 @@ class SortableMixin(models.Model):
{self.sortable_foreign_key.name: sfk_obj.id}) {self.sortable_foreign_key.name: sfk_obj.id})
try: try:
order_by = '-{}'.format(self.order_field_name) \ order_by = '-{0}'.format(self.order_field_name) \
if '{}__lt'.format(self.order_field_name) in filters.keys() else self.order_field_name if '{0}__lt'.format(self.order_field_name) in filters.keys() \
else self.order_field_name
obj = self.__class__.objects.filter( obj = self.__class__.objects.filter(
**filters).order_by(order_by)[:1][0] **filters).order_by(order_by)[:1][0]
except IndexError: except IndexError:
@ -110,12 +115,12 @@ class SortableMixin(models.Model):
def get_next(self, extra_filters={}, filter_on_sortable_fk=True): def get_next(self, extra_filters={}, filter_on_sortable_fk=True):
return self._filter_objects( return self._filter_objects(
{'{}__gt'.format(self.order_field_name): self._get_order_field_value}, {'{0}__gt'.format(self.order_field_name): self._get_order_field_value},
extra_filters, filter_on_sortable_fk) extra_filters, filter_on_sortable_fk)
def get_previous(self, extra_filters={}, filter_on_sortable_fk=True): def get_previous(self, extra_filters={}, filter_on_sortable_fk=True):
return self._filter_objects( return self._filter_objects(
{'{}__lt'.format(self.order_field_name): self._get_order_field_value}, {'{0}__lt'.format(self.order_field_name): self._get_order_field_value},
extra_filters, filter_on_sortable_fk) extra_filters, filter_on_sortable_fk)