symposion_app Changeset - fd7fff7879b3

Changeset - fd7fff7879b3

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Christopher Neugebauer - 7 years ago 2017-01-07 23:44:19
chrisjrn@gmail.com

Allows contexts to directly supply a user (so we can access registration data when e-mailing people.)

2 files changed with 27 insertions and 8 deletions:

registrasion/templatetags/registrasion_tags.py

registrasion/views.py

0 comments (0 inline, 0 general)

registrasion/templatetags/registrasion_tags.py

➞

Show inline comments

@@ ... / @@ -10,4 +10,13 @@ register = template.Library() @@
 def user_for_context(context):
     ''' Returns either context.user or context.request.user if the former is
     not defined. '''
     try:
         return context["user"]
     except KeyError:
         return context.request.user
 @register.assignment_tag(takes_context=True)
 def available_categories(context):
@@ ... / @@ -19,5 +28,5 @@ def available_categories(context): @@
     '''
-    return CategoryController.available_categories(context.request.user)
+    return CategoryController.available_categories(user_for_context(context))
@@ ... / @@ -25,5 +34,5 @@ def available_categories(context): @@
 def missing_categories(context):
     ''' Adds the categories that the user does not currently have. '''
-    user = context.request.user
+    user = user_for_context(context)
     categories_available = set(CategoryController.available_categories(user))
     items = ItemController(user).items_pending_or_purchased()
@@ ... / @@ -48,5 +57,5 @@ def available_credit(context): @@
     notes = commerce.CreditNote.unclaimed().filter(
-        invoice__user=context.request.user,
+        invoice__user=user_for_context(context),
+    )
     ret = notes.values("amount").aggregate(Sum("amount"))["amount__sum"] or 0
@@ ... / @@ -60,18 +69,27 @@ def invoices(context): @@
     Returns:
         [models.commerce.Invoice, ...]: All of the current user's invoices. '''
-    return commerce.Invoice.objects.filter(user=context.request.user)
+    return commerce.Invoice.objects.filter(user=user_for_context(context))
 @register.assignment_tag(takes_context=True)
 def items_pending(context):
     ''' Gets all of the items that the user from this context has reserved.'''
     return ItemController(context.request.user).items_pending()
     ''' Gets all of the items that the user from this context has reserved.
     The user will be either `context.user`, and `context.request.user` if
     the former is not defined.
     '''
     return ItemController(user_for_context(context)).items_pending()
 @register.assignment_tag(takes_context=True)
 def items_purchased(context, category=None):
     ''' Returns the items purchased for this user. '''
     ''' Returns the items purchased for this user.
     The user will be either `context.user`, and `context.request.user` if
     the former is not defined.
     '''
-    return ItemController(context.request.user).items_purchased(
+    return ItemController(user_for_context(context)).items_purchased(
         category=category
+    )

registrasion/views.py

➞

Show inline comments

@@ ... / @@ -952,4 +952,5 @@ def invoice_mailout(request): @@
                 Context({
                     "invoice" : invoice,
                     "user" : invoice.user,
                 })
+            )

0 comments (0 inline, 0 general)