diff --git a/src/c3nav/mapdata/migrations/0001_initial.py b/src/c3nav/mapdata/migrations/0001_initial.py index 82e7dd0e..2a3f4373 100644 --- a/src/c3nav/mapdata/migrations/0001_initial.py +++ b/src/c3nav/mapdata/migrations/0001_initial.py @@ -1,11 +1,9 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.9 on 2016-08-29 20:00 +# Generated by Django 1.9.9 on 2016-08-30 15:54 from __future__ import unicode_literals -import django.db.models.deletion from django.db import migrations, models - -import parler.models +import django.db.models.deletion class Migration(migrations.Migration): @@ -24,26 +22,15 @@ class Migration(migrations.Migration): ('type', models.CharField(choices=[('building', 'Building'), ('room', 'Room'), ('obstacle', 'Obstacle')], max_length=50)), ('geometry', models.TextField()), ], - options={ - 'abstract': False, - }, - bases=(parler.models.TranslatableModelMixin, models.Model), ), migrations.CreateModel( - name='FeatureTranslation', + name='FeatureTitle', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('language_code', models.CharField(db_index=True, max_length=15, verbose_name='Language')), - ('title', models.CharField(max_length=50, verbose_name='package title')), - ('master', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='translations', to='mapdata.Feature')), + ('language', models.CharField(max_length=50)), + ('title', models.CharField(max_length=50)), + ('feature', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='titles', to='mapdata.Feature', verbose_name='map package')), ], - options={ - 'managed': True, - 'default_permissions': (), - 'db_table': 'mapdata_feature_translation', - 'db_tablespace': '', - 'verbose_name': 'feature Translation', - }, ), migrations.CreateModel( name='Level', @@ -52,9 +39,6 @@ class Migration(migrations.Migration): ('name', models.CharField(help_text='Usually just an integer (e.g. -1, 0, 1, 2)', max_length=50, unique=True, verbose_name='level name')), ('altitude', models.DecimalField(decimal_places=2, max_digits=6, null=True, verbose_name='level altitude')), ], - options={ - 'ordering': ['altitude'], - }, ), migrations.CreateModel( name='Package', @@ -91,7 +75,7 @@ class Migration(migrations.Migration): field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='features', to='mapdata.Package', verbose_name='map package'), ), migrations.AlterUniqueTogether( - name='featuretranslation', - unique_together=set([('language_code', 'master')]), + name='featuretitle', + unique_together=set([('feature', 'language')]), ), ] diff --git a/src/c3nav/mapdata/migrations/0002_auto_20160830_1028.py b/src/c3nav/mapdata/migrations/0002_auto_20160830_1028.py deleted file mode 100644 index 2d7b2ba3..00000000 --- a/src/c3nav/mapdata/migrations/0002_auto_20160830_1028.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.9 on 2016-08-30 10:28 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('mapdata', '0001_initial'), - ] - - operations = [ - migrations.AlterModelOptions( - name='level', - options={}, - ), - ] diff --git a/src/c3nav/mapdata/models/feature.py b/src/c3nav/mapdata/models/feature.py index 43d7587b..79bec881 100644 --- a/src/c3nav/mapdata/models/feature.py +++ b/src/c3nav/mapdata/models/feature.py @@ -1,10 +1,8 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ -from parler.models import TranslatableModel, TranslatedFields - -class Feature(TranslatableModel): +class Feature(models.Model): """ A map feature """ @@ -20,6 +18,12 @@ class Feature(TranslatableModel): type = models.CharField(max_length=50, choices=TYPES) geometry = models.TextField() - translations = TranslatedFields( - title=models.CharField(_('package title'), max_length=50), - ) + +class FeatureTitle(models.Model): + feature = models.ForeignKey('Feature', on_delete=models.CASCADE, related_name='titles', + verbose_name=_('map package')) + language = models.CharField(max_length=50) + title = models.CharField(max_length=50) + + class Meta: + unique_together = ('feature', 'language') diff --git a/src/requirements.txt b/src/requirements.txt index 138dfe8e..e2dbc266 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -2,4 +2,3 @@ Django>=1.9,<1.10 django-bootstrap3>=6.2,<6.3 django-compressor==2.0 csscompressor -django-parler>=1.6,<17