From c4c8a7ab82963ee3c3ecec098a7f133efabbde44 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Mon, 11 Apr 2016 18:12:37 +1000 Subject: [PATCH] Tidies up the admin interface for flags --- .../migrations/0022_auto_20160411_0806.py | 31 +++++++++++++++++++ registrasion/models.py | 19 ++++++++++-- 2 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 registrasion/migrations/0022_auto_20160411_0806.py diff --git a/registrasion/migrations/0022_auto_20160411_0806.py b/registrasion/migrations/0022_auto_20160411_0806.py new file mode 100644 index 00000000..436937ce --- /dev/null +++ b/registrasion/migrations/0022_auto_20160411_0806.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-04-11 08:06 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('registrasion', '0021_auto_20160411_0748'), + ] + + operations = [ + migrations.AlterModelOptions( + name='categoryflag', + options={'verbose_name': 'flag (dependency on product from category)', 'verbose_name_plural': 'flags (dependency on product from category)'}, + ), + migrations.AlterModelOptions( + name='productflag', + options={'verbose_name': 'flag (dependency on product)', 'verbose_name_plural': 'flags (dependency on product)'}, + ), + migrations.AlterModelOptions( + name='timeorstocklimitflag', + options={'verbose_name': 'flag (time/stock limit)', 'verbose_name_plural': 'flags (time/stock limit)'}, + ), + migrations.AlterModelOptions( + name='voucherflag', + options={'verbose_name': 'flag (dependency on voucher)', 'verbose_name_plural': 'flags (dependency on voucher)'}, + ), + ] diff --git a/registrasion/models.py b/registrasion/models.py index a69f67dc..a7137f02 100644 --- a/registrasion/models.py +++ b/registrasion/models.py @@ -375,8 +375,8 @@ class EnablingConditionBase(models.Model): condition defined on a Product or Category, it will only be enabled if at least one condition is met. ''' - # TODO: rename to EnablingConditionBase once https://code.djangoproject.com/ticket/26488 - # is solved. + # TODO: rename to EnablingConditionBase once + # https://code.djangoproject.com/ticket/26488 is solved. objects = InheritanceManager() @@ -412,7 +412,8 @@ class TimeOrStockLimitFlag(EnablingConditionBase): ''' Registration product ceilings ''' class Meta: - verbose_name = _("ceiling") + verbose_name = _("flag (time/stock limit)") + verbose_name_plural = _("flags (time/stock limit)") start_time = models.DateTimeField( null=True, @@ -438,6 +439,10 @@ class TimeOrStockLimitFlag(EnablingConditionBase): class ProductFlag(EnablingConditionBase): ''' The condition is met because a specific product is purchased. ''' + class Meta: + verbose_name = _("flag (dependency on product)") + verbose_name_plural = _("flags (dependency on product)") + def __str__(self): return "Enabled by products: " + str(self.enabling_products.all()) @@ -453,6 +458,10 @@ class CategoryFlag(EnablingConditionBase): ''' The condition is met because a product in a particular product is purchased. ''' + class Meta: + verbose_name = _("flag (dependency on product from category)") + verbose_name_plural = _("flags (dependency on product from category)") + def __str__(self): return "Enabled by product in category: " + str(self.enabling_category) @@ -468,6 +477,10 @@ class VoucherFlag(EnablingConditionBase): ''' The condition is met because a Voucher is present. This is for e.g. enabling sponsor tickets. ''' + class Meta: + verbose_name = _("flag (dependency on voucher)") + verbose_name_plural = _("flags (dependency on voucher)") + def __str__(self): return "Enabled by voucher: %s" % self.voucher