symposion_app Changeset - de8301577617

Changeset - de8301577617

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Christopher Neugebauer - 8 years ago 2016-05-02 00:55:29
chrisjrn@gmail.com

Fixes ordering error in error display

2 files changed with 32 insertions and 27 deletions:

registrasion/controllers/flag.py

registrasion/views.py

0 comments (0 inline, 0 general)

registrasion/controllers/flag.py

➞

Show inline comments

@@ ... / @@ -12,31 +12,12 @@ from .conditions import ConditionController @@
 from registrasion.models import conditions
 from registrasion.models import inventory
 class FlagController(object):
     SINGLE = True
     PLURAL = False
     NONE = True
     SOME = False
     MESSAGE = {
         NONE: {
             SINGLE:
                 "%(items)s is no longer available to you",
             PLURAL:
                 "%(items)s are no longer available to you",
         },
         SOME: {
             SINGLE:
                 "Only %(remainder)d of the following item remains: %(items)s",
             PLURAL:
                 "Only %(remainder)d of the following items remain: %(items)s"
         },
+    }
     @classmethod
     def test_flags(
             cls, user, products=None, product_quantities=None):
         ''' Evaluates all of the flag conditions on the given products.
         If `product_quantities` is supplied, the condition is only met if it
@@ ... / @@ -100,15 +81,13 @@ class FlagController(object): @@
                 consumed = sum(quantities[i] for i in all_products)
             else:
                 consumed = 1
             met = consumed <= remainder
             if not met:
                 items = ", ".join(str(product) for product in all_products)
                 base = cls.MESSAGE[remainder == 0][len(all_products) == 1]
                 message = base % {"items": items, "remainder": remainder}
                 message = cls._error_message(all_products, remainder)
             for product in all_products:
                 if condition.is_disable_if_false:
                     do_not_disable[product] &= met
                     dif_count[product] += 1
                 else:
@@ ... / @@ -132,19 +111,17 @@ class FlagController(object): @@
                     continue
             f = total_flags.get(product)
             if f.dif > 0 and f.dif != dif_count[product]:
                 do_not_disable[product] = False
                 if product not in messages:
                     messages[product] = "Some disable-if-false " \
                                         "conditions were not met"
                     messages[product] = cls._error_message([product], 0)
             if f.eit > 0 and product not in do_enable:
                 do_enable[product] = False
                 if product not in messages:
                     messages[product] = "Some enable-if-true " \
                                         "conditions were not met"
                     messages[product] = cls._error_message([product], 0)
         for product in itertools.chain(do_not_disable, do_enable):
             f = total_flags.get(product)
             if product in do_enable:
                 # If there's an enable-if-true, we need need of those met too.
                 # (do_not_disable will default to true otherwise)
@@ ... / @@ -157,12 +134,39 @@ class FlagController(object): @@
             (product, messages[product])
             for product in valid if not valid[product]
+        ]
         return error_fields
     SINGLE = True
     PLURAL = False
     NONE = True
     SOME = False
     MESSAGE = {
         NONE: {
             SINGLE:
                 "%(items)s is no longer available to you",
             PLURAL:
                 "%(items)s are no longer available to you",
         },
         SOME: {
             SINGLE:
                 "Only %(remainder)d of the following item remains: %(items)s",
             PLURAL:
                 "Only %(remainder)d of the following items remain: %(items)s"
         },
+    }
     @classmethod
     def _error_message(cls, affected, remainder):
         product_strings = (str(product) for product in affected)
         items = ", ".join(product_strings)
         base = cls.MESSAGE[remainder == 0][len(affected) == 1]
         message = base % {"items": items, "remainder": remainder}
         return message
     @classmethod
     @BatchController.memoise
     def _filtered_flags(cls, user):
         '''
         Returns:

registrasion/views.py

➞

Show inline comments

@@ ... @@
     quantities = list(products_form.product_quantities())
     id_to_quantity = dict(i[:2] for i in quantities)
     pks = [i[0] for i in quantities]
     products = inventory.Product.objects.filter(
         id__in=pks,
     ).select_related("category")
     ).select_related("category").order_by("id")
     quantities.sort(key = lambda i: i[0])
     product_quantities = [
         (product, id_to_quantity[product.id]) for product in products
+    ]
     field_names = dict(
         (i[0][0], i[1][2]) for i in zip(product_quantities, quantities)

0 comments (0 inline, 0 general)