Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tidies up the admin interface for flags

Browse source
This commit is contained in:
Christopher Neugebauer 2016-04-11 18:12:37 +10:00
parent e88a287fef
commit c4c8a7ab82
2 changed files with 47 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
registrasion/migrations/0022_auto_20160411_0806.py Normal file
View file

@ -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)'},
),
]

19
registrasion/models.py
View file

@ -375,8 +375,8 @@ class EnablingConditionBase(models.Model):
condition defined on a Product or Category, it will only be enabled if at condition defined on a Product or Category, it will only be enabled if at
least one condition is met. ''' least one condition is met. '''
# TODO: rename to EnablingConditionBase once https://code.djangoproject.com/ticket/26488 # TODO: rename to EnablingConditionBase once
# is solved. # https://code.djangoproject.com/ticket/26488 is solved.
objects = InheritanceManager() objects = InheritanceManager()
@ -412,7 +412,8 @@ class TimeOrStockLimitFlag(EnablingConditionBase):
''' Registration product ceilings ''' ''' Registration product ceilings '''
class Meta: class Meta:
verbose_name = _("ceiling") verbose_name = _("flag (time/stock limit)")
verbose_name_plural = _("flags (time/stock limit)")
start_time = models.DateTimeField( start_time = models.DateTimeField(
null=True, null=True,
@ -438,6 +439,10 @@ class TimeOrStockLimitFlag(EnablingConditionBase):
class ProductFlag(EnablingConditionBase): class ProductFlag(EnablingConditionBase):
''' The condition is met because a specific product is purchased. ''' ''' 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): def __str__(self):
return "Enabled by products: " + str(self.enabling_products.all()) 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 ''' The condition is met because a product in a particular product is
purchased. ''' purchased. '''
class Meta:
verbose_name = _("flag (dependency on product from category)")
verbose_name_plural = _("flags (dependency on product from category)")
def __str__(self): def __str__(self):
return "Enabled by product in category: " + str(self.enabling_category) 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. ''' The condition is met because a Voucher is present. This is for e.g.
enabling sponsor tickets. ''' enabling sponsor tickets. '''
class Meta:
verbose_name = _("flag (dependency on voucher)")
verbose_name_plural = _("flags (dependency on voucher)")
def __str__(self): def __str__(self):
return "Enabled by voucher: %s" % self.voucher return "Enabled by voucher: %s" % self.voucher