add MapUpdate
This commit is contained in:
parent
e1b776a03c
commit
375454c3f1
5 changed files with 97 additions and 5 deletions
22
src/c3nav/editor/migrations/0017_changeset_map_update.py
Normal file
22
src/c3nav/editor/migrations/0017_changeset_map_update.py
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Generated by Django 1.11.2 on 2017-07-05 20:03
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('mapdata', '0014_mapupdate'),
|
||||||
|
('editor', '0016_auto_20170705_1938'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='changeset',
|
||||||
|
name='map_update',
|
||||||
|
field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='changeset', to='mapdata.MapUpdate', verbose_name='map update'),
|
||||||
|
),
|
||||||
|
]
|
|
@ -13,7 +13,7 @@ from rest_framework.exceptions import PermissionDenied
|
||||||
from c3nav.editor.models.changedobject import ChangedObject
|
from c3nav.editor.models.changedobject import ChangedObject
|
||||||
from c3nav.editor.utils import is_created_pk
|
from c3nav.editor.utils import is_created_pk
|
||||||
from c3nav.editor.wrappers import ModelWrapper
|
from c3nav.editor.wrappers import ModelWrapper
|
||||||
from c3nav.mapdata.models import LocationSlug
|
from c3nav.mapdata.models import LocationSlug, MapUpdate
|
||||||
from c3nav.mapdata.models.locations import LocationRedirect
|
from c3nav.mapdata.models.locations import LocationRedirect
|
||||||
from c3nav.mapdata.utils.models import get_submodels
|
from c3nav.mapdata.utils.models import get_submodels
|
||||||
|
|
||||||
|
@ -41,6 +41,7 @@ class ChangeSet(models.Model):
|
||||||
description = models.TextField(max_length=1000, default='', verbose_name=_('Description'))
|
description = models.TextField(max_length=1000, default='', verbose_name=_('Description'))
|
||||||
assigned_to = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT,
|
assigned_to = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT,
|
||||||
related_name='assigned_changesets', verbose_name=_('assigned to'))
|
related_name='assigned_changesets', verbose_name=_('assigned to'))
|
||||||
|
map_update = models.OneToOneField(MapUpdate, null=True, related_name='changeset', verbose_name=_('map update'))
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = _('Change Set')
|
verbose_name = _('Change Set')
|
||||||
|
@ -366,9 +367,11 @@ class ChangeSet(models.Model):
|
||||||
|
|
||||||
def apply(self, user):
|
def apply(self, user):
|
||||||
update = self.updates.create(user=user, state='applied')
|
update = self.updates.create(user=user, state='applied')
|
||||||
|
map_update = MapUpdate.objects.create(user=user, type='changeset')
|
||||||
self.state = 'applied'
|
self.state = 'applied'
|
||||||
self.last_state_update = update
|
self.last_state_update = update
|
||||||
self.last_update = update
|
self.last_update = update
|
||||||
|
self.map_update = map_update
|
||||||
self.save()
|
self.save()
|
||||||
|
|
||||||
def activate(self, request):
|
def activate(self, request):
|
||||||
|
@ -425,6 +428,8 @@ class ChangeSet(models.Model):
|
||||||
))
|
))
|
||||||
|
|
||||||
def save(self, *args, **kwargs):
|
def save(self, *args, **kwargs):
|
||||||
|
if self.state == 'applied':
|
||||||
|
raise TypeError('Applied change sets can not be edited.')
|
||||||
super().save(*args, **kwargs)
|
super().save(*args, **kwargs)
|
||||||
if self._request is not None:
|
if self._request is not None:
|
||||||
self.activate(self._request)
|
self.activate(self._request)
|
||||||
|
|
42
src/c3nav/mapdata/migrations/0014_mapupdate.py
Normal file
42
src/c3nav/mapdata/migrations/0014_mapupdate.py
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Generated by Django 1.11.2 on 2017-07-05 20:03
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from django.conf import settings
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
def create_initial_mapupdate(apps, schema_editor):
|
||||||
|
MapUpdate = apps.get_model('mapdata', 'MapUpdate')
|
||||||
|
MapUpdate.objects.create(type='initial')
|
||||||
|
|
||||||
|
def delete_initial_mapupdate(apps, schema_editor):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||||
|
('mapdata', '0013_auto_20170618_1934'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='MapUpdate',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('datetime', models.DateTimeField(auto_now_add=True, db_index=True)),
|
||||||
|
('type', models.CharField(max_length=32)),
|
||||||
|
('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='mapupdates', to=settings.AUTH_USER_MODEL)),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'verbose_name': 'Map update',
|
||||||
|
'verbose_name_plural': 'Map updates',
|
||||||
|
'get_latest_by': 'datetime',
|
||||||
|
'default_related_name': 'mapupdates',
|
||||||
|
},
|
||||||
|
),
|
||||||
|
migrations.RunPython(create_initial_mapupdate, delete_initial_mapupdate),
|
||||||
|
]
|
|
@ -1,5 +1,6 @@
|
||||||
from .level import Level # noqa
|
from c3nav.mapdata.models.geometry.level import Building, Space, Door # noqa
|
||||||
from .source import Source # noqa
|
|
||||||
from c3nav.mapdata.models.geometry.level import Building, Space, Door # noqa
|
|
||||||
from c3nav.mapdata.models.geometry.space import Area, Stair, Obstacle, LineObstacle, Hole # noqa
|
from c3nav.mapdata.models.geometry.space import Area, Stair, Obstacle, LineObstacle, Hole # noqa
|
||||||
from .locations import Location, LocationSlug, LocationGroup # noqa
|
from c3nav.mapdata.models.level import Level # noqa
|
||||||
|
from c3nav.mapdata.models.locations import Location, LocationSlug, LocationGroup # noqa
|
||||||
|
from c3nav.mapdata.models.source import Source # noqa
|
||||||
|
from c3nav.mapdata.models.update import MapUpdate # noqa
|
||||||
|
|
22
src/c3nav/mapdata/models/update.py
Normal file
22
src/c3nav/mapdata/models/update.py
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
from django.conf import settings
|
||||||
|
from django.db import models
|
||||||
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
|
|
||||||
|
class MapUpdate(models.Model):
|
||||||
|
"""
|
||||||
|
A map update. created whenever mapdata is changed.
|
||||||
|
"""
|
||||||
|
datetime = models.DateTimeField(auto_now_add=True, db_index=True)
|
||||||
|
user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT)
|
||||||
|
type = models.CharField(max_length=32)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
verbose_name = _('Map update')
|
||||||
|
verbose_name_plural = _('Map updates')
|
||||||
|
default_related_name = 'mapupdates'
|
||||||
|
get_latest_by = 'datetime'
|
||||||
|
|
||||||
|
def save(self, **kwargs):
|
||||||
|
if self.pk is not None:
|
||||||
|
raise TypeError
|
Loading…
Add table
Add a link
Reference in a new issue