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

Updated comments to be clearer. 

Minor formatting changes.
Cahnged check for sortable_by_class_is_sortable to use new check_model_is_sortable, rather than only relying on the number of objects.
master
Brandon Taylor 2014-10-24 20:30:14 -04:00
parent 3acd88e8c4
commit 116a933d92
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
adminsortable/admin.py
View File

@ -22,7 +22,7 @@ from django.http import HttpResponse
from django.shortcuts import render from django.shortcuts import render
from django.template.defaultfilters import capfirst from django.template.defaultfilters import capfirst
from adminsortable.utils import get_is_sortable from adminsortable.utils import get_is_sortable, check_model_is_sortable
from adminsortable.models import Sortable from adminsortable.models import Sortable
STATIC_URL = settings.STATIC_URL STATIC_URL = settings.STATIC_URL
@ -74,12 +74,12 @@ class SortableAdmin(SortableAdminBase, ModelAdmin):
urls = super(SortableAdmin, self).get_urls() urls = super(SortableAdmin, self).get_urls()
admin_urls = patterns('', admin_urls = patterns('',
# this view changes the order # this ajax view changes the order
url(r'^sorting/do-sorting/(?P<model_type_id>\d+)/$', url(r'^sorting/do-sorting/(?P<model_type_id>\d+)/$',
self.admin_site.admin_view(self.do_sorting_view), self.admin_site.admin_view(self.do_sorting_view),
name='admin_do_sorting'), name='admin_do_sorting'),
# this view shows a link to the drag-and-drop view # this view displays the sortable objects
url(r'^sort/$', self.admin_site.admin_view(self.sort_view), url(r'^sort/$', self.admin_site.admin_view(self.sort_view),
name='admin_sort'), name='admin_sort'),
) )
@ -121,7 +121,8 @@ class SortableAdmin(SortableAdminBase, ModelAdmin):
# `sortable_by` defined as a SortableForeignKey # `sortable_by` defined as a SortableForeignKey
sortable_by_fk = self.model.sortable_foreign_key sortable_by_fk = self.model.sortable_foreign_key
sortable_by_class_is_sortable = get_is_sortable(objects)
sortable_by_class_is_sortable = check_model_is_sortable(sortable_by_fk)
if sortable_by_property: if sortable_by_property:
# backwards compatibility for < 1.1.1, where sortable_by was a # backwards compatibility for < 1.1.1, where sortable_by was a