Merged pull request 97

adminsortable/admin.py

@@ -123,7 +123,7 @@ class SortableAdmin(SortableAdminBase, ModelAdmin):
 
         # `sortable_by` defined as a SortableForeignKey
         sortable_by_fk = self.model.sortable_foreign_key
-
+        print('sortable_by_fk: {}, {}'.format(sortable_by_fk, type(sortable_by_fk)))
         sortable_by_class_is_sortable = check_model_is_sortable(sortable_by_fk)
 
         if sortable_by_property:
@@ -176,6 +176,7 @@ class SortableAdmin(SortableAdminBase, ModelAdmin):
             'sortable_by_class_is_sortable': sortable_by_class_is_sortable,
             'sortable_by_class_display_name': sortable_by_class_display_name
         }
+        print(context['sortable_by_class_is_sortable'])
         return render(request, self.sortable_change_list_template, context)
 
     def add_view(self, request, form_url='', extra_context=None):

adminsortable/templates/adminsortable/shared/nested_objects.html

@@ -6,6 +6,7 @@
             {% with object=regrouped_object.grouper %}
                 {% if object %}
                     <li>
+                        sortable fk is sortable: {{ sortable_by_class_is_sortable }}
                         {% if sortable_by_class_is_sortable %}
                             {% render_object_rep object %}
                         {% else %}

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="{# url 'admin:admin_do_sorting' object.model_type_id #}" class="admin_sorting_url">{{ object }}</a>

adminsortable/utils.py

@@ -25,6 +25,5 @@ def check_model_is_sortable(cls):
         else:
             objects = cls.objects
 
-        if objects.count() > 1:
-            return True
+        return get_is_sortable(objects.all())
     return False