From be4d575d0cc791c651e442fd65a3ca0f4b600856 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Fri, 18 Aug 2017 15:53:46 +0200 Subject: [PATCH] prepare Enumeration properties --- docker-compose.yml | 1 - telemeta/models/enum.py | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 37ae23a7..15f30186 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -73,7 +73,6 @@ worker: env_file: - env/prod.env command: /bin/bash scripts/worker.sh - command: /bin/bash scripts/enumeration.sh links: - broker - db diff --git a/telemeta/models/enum.py b/telemeta/models/enum.py index bfef8d67..88a4d17e 100644 --- a/telemeta/models/enum.py +++ b/telemeta/models/enum.py @@ -28,8 +28,6 @@ class Enumeration(ModelCore): value = CharField(_('value'), required=True, unique=True) notes = TextField(_('notes')) - is_hidden = BooleanField(_('is hidden'), default=True) - is_admin = BooleanField(_('is admin'), default=True) def __unicode__(self): return self.value @@ -37,9 +35,22 @@ class Enumeration(ModelCore): class Meta(MetaCore): abstract = True + class MetaEnumeration(MetaCore): ordering = ['value'] + +class EnumerationProperty(models.Model): + + enumeration_name = models.CharField(_('enumeration name')) + is_hidden = BooleanField(_('is hidden'), default=False) + is_admin = BooleanField(_('is admin'), default=True) + + class Meta: + verbose_name = _("enumeration property") + verbose_name_plural = _("enumeration properties") + + class PhysicalFormat(Enumeration): "Collection physical format" -- 2.39.5