Skip to content

Commit 40a2eba

Browse files
authored
Merge pull request #4 from thclark/clusterable
Added modelcluster and orderable
2 parents d7beb6b + 8d705a2 commit 40a2eba

3 files changed

Lines changed: 23 additions & 4 deletions

File tree

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
setup(
2020
name='wagtail_references',
21-
version='0.1.2',
21+
version='0.2.0',
2222
description='BibTeX references for Wagtail',
2323
long_description=readme_text,
2424
author='thclark',
@@ -33,7 +33,7 @@
3333
'License :: OSI Approved :: MIT License',
3434
'Programming Language :: Python :: 3.6',
3535
'Programming Language :: Python :: 3.7',
36-
"Operating System :: OS Independent"
36+
'Operating System :: OS Independent'
3737
],
3838
include_package_data=True,
3939
install_requires=[
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Generated by Django 2.1.4 on 2019-04-18 07:04
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('wagtail_references', '0002_reference_bibjson'),
10+
]
11+
12+
operations = [
13+
migrations.AddField(
14+
model_name='reference',
15+
name='sort_order',
16+
field=models.IntegerField(blank=True, editable=False, null=True),
17+
),
18+
]

wagtail_references/models.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
from django.conf import settings
22
from django.db import models
33
from django.utils.translation import ugettext_lazy as _
4-
from wagtail.core.models import CollectionMember
4+
from wagtail.core.models import CollectionMember, Orderable
55
from wagtail.search import index
66
from wagtail.search.queryset import SearchableQuerySetMixin
77
from wagtail.snippets.models import register_snippet
88
import jsonfield
9+
from modelcluster.models import ClusterableModel
910

1011

1112
class ReferenceQuerySet(SearchableQuerySetMixin, models.QuerySet):
1213
pass
1314

1415

15-
class AbstractReference(CollectionMember, index.Indexed, models.Model):
16+
class AbstractReference(ClusterableModel, CollectionMember, Orderable, index.Indexed, models.Model):
1617
slug = models.CharField(max_length=255, unique=True, verbose_name=_('slug'), help_text=_('A short key to cite the reference by. Determined from the BibTeX entry key. Must be unique.'))
1718
bibtex = models.TextField(help_text=_('The reference, in bibtex format.'))
1819
bibtype = models.CharField(max_length=255, verbose_name=_('Bibliography entry type'), default='article', help_text=_('The entry type, detected from the BibTeX entry.'))

0 commit comments

Comments
 (0)