From 748c3ec7c4e95e3ff761a43150b93f158463fc12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Mon, 28 Nov 2016 16:55:34 +0100 Subject: [PATCH] fix Source packageio --- src/c3nav/mapdata/models/base.py | 2 +- src/c3nav/mapdata/models/source.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/c3nav/mapdata/models/base.py b/src/c3nav/mapdata/models/base.py index 7d8f7902..4bd10fb7 100644 --- a/src/c3nav/mapdata/models/base.py +++ b/src/c3nav/mapdata/models/base.py @@ -10,7 +10,7 @@ MAPITEM_TYPES = OrderedDict() class MapItemMeta(ModelBase): def __new__(mcs, name, bases, attrs): cls = super().__new__(mcs, name, bases, attrs) - if not cls._meta.abstract: + if not cls._meta.abstract and name != 'Source': MAPITEM_TYPES[name.lower()] = cls return cls diff --git a/src/c3nav/mapdata/models/source.py b/src/c3nav/mapdata/models/source.py index 0a99195e..fbf07604 100644 --- a/src/c3nav/mapdata/models/source.py +++ b/src/c3nav/mapdata/models/source.py @@ -1,14 +1,13 @@ from django.db import models -from django.db.models import Model from django.utils.translation import ugettext_lazy as _ +from c3nav.mapdata.models.base import MapItem -class Source(Model): + +class Source(MapItem): """ A map source, images of levels that can be useful as backgrounds for the map editor """ - name = models.SlugField(_('Name'), unique=True, max_length=50) - package = models.ForeignKey('mapdata.Package', on_delete=models.CASCADE, verbose_name=_('map package')) bottom = models.DecimalField(_('bottom coordinate'), max_digits=6, decimal_places=2) left = models.DecimalField(_('left coordinate'), max_digits=6, decimal_places=2) top = models.DecimalField(_('top coordinate'), max_digits=6, decimal_places=2)