Skip to content
Snippets Groups Projects
Commit b27c71f9 authored by Martin Burchell's avatar Martin Burchell
Browse files

Changed taxonomies classes to not be abstract

Removed taxonomy and term classes from data_layer - just reference the ones
in taxonomies app directly for now.

Will need to run "deploy/tasks.py clean_db" and "deploy/tasks.py update_db"
parent 3349b1fb
No related branches found
No related tags found
No related merge requests found
from django.db import models
import taxonomies.models
class DataLayerModel(models.Model):
created = models.DateTimeField(auto_now_add=True)
......@@ -23,11 +21,3 @@ class Message(DataLayerModel):
# TODO: rename this class
Item = Message
class Taxonomy(taxonomies.models.Taxonomy):
pass
class Term(taxonomies.models.Term):
pass
......@@ -3,9 +3,10 @@ from rest_framework import serializers
from data_layer.models import (
Item,
Taxonomy,
)
from taxonomies.models import Taxonomy
class ItemSerializer(serializers.ModelSerializer):
class Meta:
......
......@@ -5,7 +5,7 @@ import pytest
from django.core.urlresolvers import reverse
from rest_framework.test import APIRequestFactory
from data_layer.models import Taxonomy, Term
from taxonomies.models import Taxonomy, Term
from ..views import TaxonomyViewSet
......
......@@ -3,8 +3,12 @@ from rest_framework import viewsets
from data_layer.models import (
Item,
)
from taxonomies.models import (
Taxonomy,
)
from .serializers import (
ItemSerializer,
TaxonomySerializer,
......
......@@ -7,7 +7,6 @@ from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('data_layer', '0002_auto_20150619_2132'),
]
operations = [
......@@ -17,8 +16,14 @@ class Migration(migrations.Migration):
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('name', models.CharField(help_text='Taxonomy Name', unique=True, max_length=250, verbose_name='Name', db_index=True)),
],
options={
'abstract': False,
},
),
migrations.CreateModel(
name='Term',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('name', models.CharField(help_text='Taxonomy Name', unique=True, max_length=250, verbose_name='Name', db_index=True)),
('long_name', models.TextField(verbose_name='Long Name', blank=True)),
('taxonomy', models.ForeignKey(related_name='taxonomies_term_term', verbose_name='Taxonomy', to='taxonomies.Taxonomy')),
],
),
]
......@@ -4,9 +4,6 @@ from django.utils.translation import ugettext_lazy as _
class Taxonomy(models.Model):
class Meta:
abstract = True
name = models.CharField(
_('Name'),
max_length=250,
......@@ -38,12 +35,8 @@ class Taxonomy(models.Model):
# to do free tagging use 'multiple' and 'open'
class Term(models.Model):
class Meta:
abstract = True
name = models.CharField(
_('Name'),
max_length=250,
......@@ -53,7 +46,7 @@ class Term(models.Model):
)
taxonomy = models.ForeignKey(
Taxonomy,
'taxonomies.Taxonomy',
verbose_name=_('Taxonomy'),
related_name="%(app_label)s_%(class)s_term"
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment