diff --git a/python3_sample_project/app/admin.py b/python3_sample_project/app/admin.py index 737eba6..580bf5a 100644 --- a/python3_sample_project/app/admin.py +++ b/python3_sample_project/app/admin.py @@ -6,7 +6,7 @@ from adminsortable.admin import (SortableAdmin, SortableTabularInline, from adminsortable.utils import get_is_sortable from app.models import (Category, Widget, Project, Credit, Note, GenericNote, Component, Person, NonSortableCategory, SortableCategoryWidget, - SelfReferentialCategory) + SortableNonInlineCategory, SelfReferentialCategory) admin.site.register(Category, SortableAdmin) @@ -79,5 +79,6 @@ class NonSortableCategoryAdmin(NonSortableParentAdmin): admin.site.register(NonSortableCategory, NonSortableCategoryAdmin) +admin.site.register(SortableNonInlineCategory, SortableAdmin) admin.site.register(SelfReferentialCategory, SortableAdmin) diff --git a/python3_sample_project/app/models.py b/python3_sample_project/app/models.py index 72c1874..34127b1 100644 --- a/python3_sample_project/app/models.py +++ b/python3_sample_project/app/models.py @@ -141,6 +141,21 @@ class SortableCategoryWidget(SimpleModel, Sortable): return self.title +class SortableNonInlineCategory(SimpleModel, Sortable): + """Example of a model that is sortable, but has a SortableForeignKey + that is *not* sortable, and is also not defined as an inline of the + SortableForeignKey field.""" + + class Meta(Sortable.Meta): + verbose_name = 'Sortable Non-Inline Category' + verbose_name_plural = 'Sortable Non-Inline Categories' + + non_sortable_category = SortableForeignKey(NonSortableCategory) + + def __str__(self): + return self.title + + class SelfReferentialCategory(SimpleModel, Sortable): class Meta(Sortable.Meta): verbose_name = 'Sortable Referential Category' diff --git a/python3_sample_project/database/python3-test-project.sqlite3 b/python3_sample_project/database/python3-test-project.sqlite3 index 550f918..95395d0 100644 Binary files a/python3_sample_project/database/python3-test-project.sqlite3 and b/python3_sample_project/database/python3-test-project.sqlite3 differ diff --git a/sample_project/app/models.py b/sample_project/app/models.py index eab5e30..e90e85e 100644 --- a/sample_project/app/models.py +++ b/sample_project/app/models.py @@ -123,6 +123,9 @@ class NonSortableCategory(SimpleModel): verbose_name = 'Non-Sortable Category' verbose_name_plural = 'Non-Sortable Categories' + def __unicode__(self): + return self.title + class SortableCategoryWidget(SimpleModel, Sortable): class Meta(Sortable.Meta): @@ -131,6 +134,9 @@ class SortableCategoryWidget(SimpleModel, Sortable): non_sortable_category = SortableForeignKey(NonSortableCategory) + def __unicode__(self): + return self.title + class SortableNonInlineCategory(SimpleModel, Sortable): """Example of a model that is sortable, but has a SortableForeignKey @@ -142,3 +148,6 @@ class SortableNonInlineCategory(SimpleModel, Sortable): verbose_name_plural = 'Sortable Non-Inline Categories' non_sortable_category = SortableForeignKey(NonSortableCategory) + + def __unicode__(self): + return self.title diff --git a/sample_project/database/test_project.sqlite b/sample_project/database/test_project.sqlite index 372233b..723eb74 100644 Binary files a/sample_project/database/test_project.sqlite and b/sample_project/database/test_project.sqlite differ