From 8731fd5f110f4e99fd55703a3260aaae5feec7f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Sat, 16 Sep 2017 14:19:01 +0200 Subject: [PATCH] color should be up to 32 characters, fix color migration --- .../migrations/0025_remove_area_stuffed.py | 7 ++++++- .../migrations/0035_auto_20170916_1216.py | 20 +++++++++++++++++++ src/c3nav/mapdata/models/locations.py | 2 +- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 src/c3nav/mapdata/migrations/0035_auto_20170916_1216.py diff --git a/src/c3nav/mapdata/migrations/0025_remove_area_stuffed.py b/src/c3nav/mapdata/migrations/0025_remove_area_stuffed.py index 88119d77..b459e64c 100644 --- a/src/c3nav/mapdata/migrations/0025_remove_area_stuffed.py +++ b/src/c3nav/mapdata/migrations/0025_remove_area_stuffed.py @@ -2,7 +2,7 @@ # Generated by Django 1.11.2 on 2017-07-13 10:31 from __future__ import unicode_literals -from django.db import migrations +from django.db import migrations, models def convert_stuffed_area_to_location_group(apps, schema_editor): @@ -24,6 +24,11 @@ class Migration(migrations.Migration): ] operations = [ + migrations.AlterField( + model_name='locationgroup', + name='color', + field=models.CharField(blank=True, max_length=32, null=True, verbose_name='background color'), + ), migrations.RunPython(convert_stuffed_area_to_location_group), migrations.RemoveField( model_name='area', diff --git a/src/c3nav/mapdata/migrations/0035_auto_20170916_1216.py b/src/c3nav/mapdata/migrations/0035_auto_20170916_1216.py new file mode 100644 index 00000000..9ad547f8 --- /dev/null +++ b/src/c3nav/mapdata/migrations/0035_auto_20170916_1216.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.2 on 2017-09-16 12:16 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mapdata', '0034_auto_20170807_1523'), + ] + + operations = [ + migrations.AlterField( + model_name='locationgroup', + name='color', + field=models.CharField(blank=True, max_length=32, null=True, verbose_name='background color'), + ), + ] diff --git a/src/c3nav/mapdata/models/locations.py b/src/c3nav/mapdata/models/locations.py index 6e0b490f..7e03b145 100644 --- a/src/c3nav/mapdata/models/locations.py +++ b/src/c3nav/mapdata/models/locations.py @@ -183,7 +183,7 @@ class LocationGroup(Location, models.Model): category = models.ForeignKey(LocationGroupCategory, related_name='groups', on_delete=models.PROTECT, verbose_name=_('Category')) priority = models.IntegerField(default=0, db_index=True) - color = models.CharField(null=True, blank=True, max_length=16, verbose_name=_('background color')) + color = models.CharField(null=True, blank=True, max_length=32, verbose_name=_('background color')) objects = LocationGroupManager()