Fix some rules that were overly generous

This commit is contained in:
James Polley 2017-10-02 00:02:15 +11:00
parent 0103f9a91f
commit abe4f5ad7a

View file

@ -646,7 +646,6 @@ class Command(BaseCommand):
) )
pdns_by_staff.group.set([ pdns_by_staff.group.set([
self.group_team, self.group_team,
self.group_volunteers,
]) ])
pdns_by_staff.categories.set([self.pdns_category, ]) pdns_by_staff.categories.set([self.pdns_category, ])
@ -655,7 +654,7 @@ class Command(BaseCommand):
cond.CategoryFlag, cond.CategoryFlag,
("description", ), ("description", ),
description="GottaGettaTicketFirst", description="GottaGettaTicketFirst",
condition=cond.FlagBase.ENABLE_IF_TRUE, condition=cond.FlagBase.DISABLE_IF_FALSE,
enabling_category = self.ticket enabling_category = self.ticket
) )
needs_a_ticket.categories.set([ needs_a_ticket.categories.set([
@ -798,15 +797,14 @@ class Command(BaseCommand):
]) ])
free_category(ticket_student_inclusions, self.t_shirt) free_category(ticket_student_inclusions, self.t_shirt)
# Team & volunteer ticket inclusions # Team ticket inclusions
ticket_staff_inclusions = self.find_or_make( ticket_staff_inclusions = self.find_or_make(
cond.IncludedProductDiscount, cond.IncludedProductDiscount,
("description", ), ("description", ),
description="Complimentary for ticket holder (staff/volunteer)", description="Complimentary for ticket holder staff)",
) )
ticket_staff_inclusions.enabling_products.set([ ticket_staff_inclusions.enabling_products.set([
self.ticket_team, self.ticket_team,
self.ticket_volunteer,
]) ])
free_category(ticket_staff_inclusions, self.penguin_dinner) free_category(ticket_staff_inclusions, self.penguin_dinner)