don't use tokens as primary keys
This commit is contained in:
parent
afb23e5865
commit
64664fbc66
5 changed files with 50 additions and 7 deletions
|
@ -0,0 +1,43 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.11.7 on 2017-12-18 13:49
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
|
||||
def remove_all_tokens(apps, schema_editor):
|
||||
apps.get_model('mapdata', 'AccessPermissionToken').objects.all().delete()
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('mapdata', '0059_multiple_accesspermissions'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RunPython(remove_all_tokens, remove_all_tokens),
|
||||
migrations.RemoveField(
|
||||
model_name='accesspermission',
|
||||
name='token',
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='accesspermissiontoken',
|
||||
name='token',
|
||||
field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='accesspermissiontoken',
|
||||
name='id',
|
||||
field=models.AutoField(primary_key=True, serialize=False),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='accesspermission',
|
||||
name='token',
|
||||
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE,
|
||||
related_name='accesspermissions', to='mapdata.AccessPermissionToken',
|
||||
verbose_name='Access permission token'),
|
||||
),
|
||||
]
|
|
@ -40,7 +40,7 @@ AccessPermissionTokenItem = namedtuple('AccessPermissionTokenItem', ('pk', 'expi
|
|||
|
||||
|
||||
class AccessPermissionToken(models.Model):
|
||||
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
|
||||
token = models.UUIDField(unique=True, default=uuid.uuid4, editable=False)
|
||||
author = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT,
|
||||
related_name='created_accesspermission_tokens',
|
||||
verbose_name=_('author'))
|
||||
|
|
|
@ -9,7 +9,7 @@ from django.utils.text import format_lazy
|
|||
from django.utils.translation import ugettext_lazy as _
|
||||
from shapely.geometry import CAP_STYLE, JOIN_STYLE, mapping
|
||||
|
||||
from c3nav.mapdata.fields import GeometryField, JSONField
|
||||
from c3nav.mapdata.fields import GeometryField, JSONField, I18nField
|
||||
from c3nav.mapdata.models.geometry.base import GeometryMixin
|
||||
from c3nav.mapdata.models.locations import SpecificLocation
|
||||
from c3nav.mapdata.utils.cache.changes import changed_geometries
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue