2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

remove unique_together

Browse source
This commit is contained in:
Laura Klünder 2016-10-15 10:51:46 +02:00
parent ecc7c4f829
commit d3c507e319
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/c3nav/mapdata/migrations/0001_initial.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.10.1 on 2016-10-12 12:12 # Generated by Django 1.10.2 on 2016-10-15 08:51
from __future__ import unicode_literals from __future__ import unicode_literals
import c3nav.mapdata.fields import c3nav.mapdata.fields
@ -19,13 +19,13 @@ class Migration(migrations.Migration):
name='Inside', name='Inside',
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')),
('name', models.SlugField(unique=True, verbose_name='name')), ('name', models.SlugField(unique=True, verbose_name='Name')),
('geometry', c3nav.mapdata.fields.GeometryField()), ('geometry', c3nav.mapdata.fields.GeometryField()),
], ],
options={ options={
'verbose_name_plural': 'Inside Areas',
'default_related_name': 'insides', 'default_related_name': 'insides',
'verbose_name': 'Inside Area', 'verbose_name': 'Inside Area',
'verbose_name_plural': 'Inside Areas',
}, },
), ),
migrations.CreateModel( migrations.CreateModel(
@ -36,7 +36,9 @@ class Migration(migrations.Migration):
('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={ options={
'abstract': False, 'verbose_name_plural': 'Levels',
'default_related_name': 'levels',
'verbose_name': 'Level',
}, },
), ),
migrations.CreateModel( migrations.CreateModel(
@ -51,32 +53,34 @@ class Migration(migrations.Migration):
('top', models.DecimalField(decimal_places=2, max_digits=6, null=True, verbose_name='top coordinate')), ('top', models.DecimalField(decimal_places=2, max_digits=6, null=True, verbose_name='top coordinate')),
('right', models.DecimalField(decimal_places=2, max_digits=6, null=True, verbose_name='right coordinate')), ('right', models.DecimalField(decimal_places=2, max_digits=6, null=True, verbose_name='right coordinate')),
('directory', models.CharField(max_length=100, verbose_name='folder name')), ('directory', models.CharField(max_length=100, verbose_name='folder name')),
('depends', models.ManyToManyField(to='mapdata.Package')), ('depends', models.ManyToManyField(related_name='packages', to='mapdata.Package')),
], ],
options={ options={
'abstract': False, 'verbose_name_plural': 'Map Packages',
'default_related_name': 'packages',
'verbose_name': 'Map Package',
}, },
), ),
migrations.CreateModel( migrations.CreateModel(
name='Room', name='Room',
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')),
('name', models.SlugField(unique=True, verbose_name='name')), ('name', models.SlugField(unique=True, verbose_name='Name')),
('geometry', c3nav.mapdata.fields.GeometryField()), ('geometry', c3nav.mapdata.fields.GeometryField()),
('level', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rooms', to='mapdata.Level', verbose_name='level')), ('level', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rooms', to='mapdata.Level', verbose_name='level')),
('package', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rooms', to='mapdata.Package', verbose_name='map package')), ('package', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rooms', to='mapdata.Package', verbose_name='map package')),
], ],
options={ options={
'verbose_name_plural': 'Rooms',
'default_related_name': 'rooms', 'default_related_name': 'rooms',
'verbose_name': 'Room', 'verbose_name': 'Room',
'verbose_name_plural': 'Rooms',
}, },
), ),
migrations.CreateModel( migrations.CreateModel(
name='Source', name='Source',
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')),
('name', models.SlugField(unique=True, verbose_name='source name')), ('name', models.SlugField(unique=True, verbose_name='Name')),
('bottom', models.DecimalField(decimal_places=2, max_digits=6, verbose_name='bottom coordinate')), ('bottom', models.DecimalField(decimal_places=2, max_digits=6, verbose_name='bottom coordinate')),
('left', models.DecimalField(decimal_places=2, max_digits=6, verbose_name='left coordinate')), ('left', models.DecimalField(decimal_places=2, max_digits=6, verbose_name='left coordinate')),
('top', models.DecimalField(decimal_places=2, max_digits=6, verbose_name='top coordinate')), ('top', models.DecimalField(decimal_places=2, max_digits=6, verbose_name='top coordinate')),
@ -84,7 +88,9 @@ class Migration(migrations.Migration):
('package', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='sources', to='mapdata.Package', verbose_name='map package')), ('package', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='sources', to='mapdata.Package', verbose_name='map package')),
], ],
options={ options={
'abstract': False, 'verbose_name_plural': 'Sources',
'default_related_name': 'sources',
'verbose_name': 'Source',
}, },
), ),
migrations.AddField( migrations.AddField(

3
src/c3nav/mapdata/models/base.py
View file

@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _
class MapdataModel(models.Model): class MapdataModel(models.Model):
name = models.SlugField(_('Name'), max_length=50) name = models.SlugField(_('Name'), unique=True, max_length=50)
package = models.ForeignKey('mapdata.Package', on_delete=models.CASCADE, verbose_name=_('map package')) package = models.ForeignKey('mapdata.Package', on_delete=models.CASCADE, verbose_name=_('map package'))
@classmethod @classmethod
@ -29,4 +29,3 @@ class MapdataModel(models.Model):
class Meta: class Meta:
abstract = True abstract = True
unique_together = ('package', 'name')