remove django-parler
This commit is contained in:
parent
c5f03e546b
commit
30004724cd
4 changed files with 18 additions and 50 deletions
|
@ -1,11 +1,9 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- 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
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import django.db.models.deletion
|
|
||||||
from django.db import migrations, models
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
import parler.models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
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)),
|
('type', models.CharField(choices=[('building', 'Building'), ('room', 'Room'), ('obstacle', 'Obstacle')], max_length=50)),
|
||||||
('geometry', models.TextField()),
|
('geometry', models.TextField()),
|
||||||
],
|
],
|
||||||
options={
|
|
||||||
'abstract': False,
|
|
||||||
},
|
|
||||||
bases=(parler.models.TranslatableModelMixin, models.Model),
|
|
||||||
),
|
),
|
||||||
migrations.CreateModel(
|
migrations.CreateModel(
|
||||||
name='FeatureTranslation',
|
name='FeatureTitle',
|
||||||
fields=[
|
fields=[
|
||||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
('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')),
|
('language', models.CharField(max_length=50)),
|
||||||
('title', models.CharField(max_length=50, verbose_name='package title')),
|
('title', models.CharField(max_length=50)),
|
||||||
('master', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='translations', to='mapdata.Feature')),
|
('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(
|
migrations.CreateModel(
|
||||||
name='Level',
|
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')),
|
('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')),
|
('altitude', models.DecimalField(decimal_places=2, max_digits=6, null=True, verbose_name='level altitude')),
|
||||||
],
|
],
|
||||||
options={
|
|
||||||
'ordering': ['altitude'],
|
|
||||||
},
|
|
||||||
),
|
),
|
||||||
migrations.CreateModel(
|
migrations.CreateModel(
|
||||||
name='Package',
|
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'),
|
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='features', to='mapdata.Package', verbose_name='map package'),
|
||||||
),
|
),
|
||||||
migrations.AlterUniqueTogether(
|
migrations.AlterUniqueTogether(
|
||||||
name='featuretranslation',
|
name='featuretitle',
|
||||||
unique_together=set([('language_code', 'master')]),
|
unique_together=set([('feature', 'language')]),
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
@ -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={},
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -1,10 +1,8 @@
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from parler.models import TranslatableModel, TranslatedFields
|
|
||||||
|
|
||||||
|
class Feature(models.Model):
|
||||||
class Feature(TranslatableModel):
|
|
||||||
"""
|
"""
|
||||||
A map feature
|
A map feature
|
||||||
"""
|
"""
|
||||||
|
@ -20,6 +18,12 @@ class Feature(TranslatableModel):
|
||||||
type = models.CharField(max_length=50, choices=TYPES)
|
type = models.CharField(max_length=50, choices=TYPES)
|
||||||
geometry = models.TextField()
|
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')
|
||||||
|
|
|
@ -2,4 +2,3 @@ Django>=1.9,<1.10
|
||||||
django-bootstrap3>=6.2,<6.3
|
django-bootstrap3>=6.2,<6.3
|
||||||
django-compressor==2.0
|
django-compressor==2.0
|
||||||
csscompressor
|
csscompressor
|
||||||
django-parler>=1.6,<17
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue