From 14dbe2fb3c34e634903e12b021375b1bb25ad1d0 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Tue, 10 Mar 2020 09:00:10 +0100
Subject: [PATCH] Use same schema for name fields as everywhere else
---
.../chronos/migrations/0007_advanced_models_from_untis.py | 4 ++--
aleksis/apps/chronos/models.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py b/aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py
index 88c3a23d..b4dccd4e 100644
--- a/aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py
+++ b/aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py
@@ -89,8 +89,8 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('extended_data', django.contrib.postgres.fields.jsonb.JSONField(default=dict, editable=False)),
- ('name', models.CharField(max_length=10, verbose_name='Short name')),
- ('longname', models.CharField(max_length=50, verbose_name='Long name')),
+ ('short_name', models.CharField(max_length=10, verbose_name='Short name')),
+ ('name', models.CharField(max_length=50, verbose_name='Long name')),
('colour_fg', colorfield.fields.ColorField(default='#FFFFFF', max_length=18)),
('colour_bg', colorfield.fields.ColorField(default='#FFFFFF', max_length=18)),
],
diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py
index 5a3f0606..7f384111 100644
--- a/aleksis/apps/chronos/models.py
+++ b/aleksis/apps/chronos/models.py
@@ -635,8 +635,8 @@ class Holiday(ExtensibleModel):
class SupervisionArea(ExtensibleModel):
- name = models.CharField(verbose_name=_("Short name"), max_length=10)
- longname = models.CharField(verbose_name=_("Long name"), max_length=50)
+ short_name = models.CharField(verbose_name=_("Short name"), max_length=10)
+ name = models.CharField(verbose_name=_("Long name"), max_length=50)
colour_fg = ColorField()
colour_bg = ColorField()
--
GitLab