Added migrations, fixed queryset call and fixed meta inheritance for self-referential sample model.

master
Brandon Taylor 2014-11-03 10:45:50 -05:00
parent 7c60d89c71
commit a48cf00396
4 changed files with 68 additions and 1 deletions

View File

@ -5,7 +5,8 @@ from adminsortable.admin import (SortableAdmin, SortableTabularInline,
NonSortableParentAdmin) NonSortableParentAdmin)
from adminsortable.utils import get_is_sortable from adminsortable.utils import get_is_sortable
from app.models import (Category, Widget, Project, Credit, Note, GenericNote, from app.models import (Category, Widget, Project, Credit, Note, GenericNote,
Component, Person, NonSortableCategory, SortableCategoryWidget) Component, Person, NonSortableCategory, SortableCategoryWidget,
SelfReferentialCategory)
admin.site.register(Category, SortableAdmin) admin.site.register(Category, SortableAdmin)
@ -77,3 +78,6 @@ class NonSortableCategoryAdmin(NonSortableParentAdmin):
inlines = [SortableCategoryWidgetInline] inlines = [SortableCategoryWidgetInline]
admin.site.register(NonSortableCategory, NonSortableCategoryAdmin) admin.site.register(NonSortableCategory, NonSortableCategoryAdmin)
admin.site.register(SelfReferentialCategory, SortableAdmin)

View File

@ -0,0 +1,28 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
import adminsortable.fields
class Migration(migrations.Migration):
dependencies = [
('app', '0002_nonsortablecategory_sortablecategorywidget'),
]
operations = [
migrations.CreateModel(
name='SelfReferentialCategory',
fields=[
('id', models.AutoField(serialize=False, auto_created=True, primary_key=True, verbose_name='ID')),
('order', models.PositiveIntegerField(db_index=True, editable=False, default=1)),
('title', models.CharField(max_length=50)),
('child', adminsortable.fields.SortableForeignKey(to='app.SelfReferentialCategory')),
],
options={
'abstract': False,
},
bases=(models.Model,),
),
]

View File

@ -0,0 +1,24 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
import adminsortable.fields
class Migration(migrations.Migration):
dependencies = [
('app', '0003_selfreferentialcategory'),
]
operations = [
migrations.AlterModelOptions(
name='selfreferentialcategory',
options={'verbose_name_plural': 'Sortable Referential Categories', 'verbose_name': 'Sortable Referential Category'},
),
migrations.AlterField(
model_name='selfreferentialcategory',
name='child',
field=adminsortable.fields.SortableForeignKey(to='app.SelfReferentialCategory', null=True, blank=True),
),
]

View File

@ -139,3 +139,14 @@ class SortableCategoryWidget(SimpleModel, Sortable):
def __str__(self): def __str__(self):
return self.title return self.title
class SelfReferentialCategory(SimpleModel, Sortable):
class Meta(Sortable.Meta):
verbose_name = 'Sortable Referential Category'
verbose_name_plural = 'Sortable Referential Categories'
child = SortableForeignKey('self', blank=True, null=True)
def __str__(self):
return self.title