From f48298ae1df18902423f2bb85e91b3d81e95faaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Mon, 10 Jul 2017 19:16:35 +0200 Subject: [PATCH] add priority to LocationGroup and and default -priority ordering --- .../migrations/0021_auto_20170710_1916.py | 28 +++++++++++++++++++ src/c3nav/mapdata/models/locations.py | 3 ++ 2 files changed, 31 insertions(+) create mode 100644 src/c3nav/mapdata/migrations/0021_auto_20170710_1916.py diff --git a/src/c3nav/mapdata/migrations/0021_auto_20170710_1916.py b/src/c3nav/mapdata/migrations/0021_auto_20170710_1916.py new file mode 100644 index 00000000..b379f631 --- /dev/null +++ b/src/c3nav/mapdata/migrations/0021_auto_20170710_1916.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.2 on 2017-07-10 17:16 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mapdata', '0020_auto_20170710_1848'), + ] + + operations = [ + migrations.AlterModelOptions( + name='locationgroup', + options={'ordering': ('-priority',), 'verbose_name': 'Location Group', 'verbose_name_plural': 'Location Groups'}, + ), + migrations.AlterModelOptions( + name='locationgroupcategory', + options={'ordering': ('-priority',), 'verbose_name': 'Location Group Category', 'verbose_name_plural': 'Location Group Categories'}, + ), + migrations.AddField( + model_name='locationgroup', + name='priority', + field=models.IntegerField(db_index=True, default=0), + ), + ] diff --git a/src/c3nav/mapdata/models/locations.py b/src/c3nav/mapdata/models/locations.py index d9aa452d..014a5511 100644 --- a/src/c3nav/mapdata/models/locations.py +++ b/src/c3nav/mapdata/models/locations.py @@ -164,6 +164,7 @@ class LocationGroupCategory(TitledMixin, models.Model): verbose_name = _('Location Group Category') verbose_name_plural = _('Location Group Categories') default_related_name = 'locationgroupcategories' + ordering = ('-priority', ) def _serialize(self, **kwargs): result = super()._serialize(**kwargs) @@ -178,11 +179,13 @@ class LocationGroup(Location, models.Model): verbose_name=_('Category')) compiled_room = models.BooleanField(default=False, verbose_name=_('is a compiled room')) compiled_area = models.BooleanField(default=False, verbose_name=_('is a compiled area')) + priority = models.IntegerField(default=0, db_index=True) class Meta: verbose_name = _('Location Group') verbose_name_plural = _('Location Groups') default_related_name = 'locationgroups' + ordering = ('-priority',) def _serialize(self, **kwargs): result = super()._serialize(**kwargs)