Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
UCC
uccportal
Commits
9e9387fb
Commit
9e9387fb
authored
Feb 25, 2019
by
frekk
Browse files
moved make_pending_membership to register.py
parent
05920eef
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/memberdb/approve.py
View file @
9e9387fb
...
...
@@ -12,15 +12,6 @@ from memberdb.models import Member, Membership, get_membership_type
from
memberdb.forms
import
MyModelForm
from
memberdb.views
import
MyUpdateView
def
make_pending_membership
(
member
):
# check if this member already has a pending membership
ms
=
Membership
.
objects
.
filter
(
member
=
member
,
approved__exact
=
False
).
first
()
if
(
ms
is
None
):
ms
=
Membership
(
member
=
member
,
approved
=
False
)
ms
.
date_submitted
=
timezone
.
now
()
ms
.
membership_type
=
get_membership_type
(
member
)
return
ms
"""
inline admin change list action buttons
see https://medium.com/@hakibenita/how-to-add-custom-action-buttons-to-django-admin-8d266f5b0d41
...
...
src/memberdb/models.py
View file @
9e9387fb
...
...
@@ -3,6 +3,7 @@ from django.db.models import F
from
django.core.validators
import
RegexValidator
from
django.core.management.utils
import
get_random_string
from
django.urls
import
reverse
from
django.utils
import
timezone
from
squarepay.dispense
import
get_item_price
import
subprocess
...
...
@@ -98,6 +99,14 @@ def get_membership_type(member):
break
return
best
def
make_pending_membership
(
member
):
# check if this member already has a pending membership
ms
=
Membership
.
objects
.
filter
(
member
=
member
,
approved__exact
=
False
).
first
()
if
(
ms
is
None
):
ms
=
Membership
(
member
=
member
,
approved
=
False
)
ms
.
date_submitted
=
timezone
.
now
()
ms
.
membership_type
=
get_membership_type
(
member
)
return
ms
def
make_token
():
return
get_random_string
(
128
)
...
...
src/memberdb/register.py
View file @
9e9387fb
...
...
@@ -13,10 +13,9 @@ from django import forms
from
squarepay.models
import
MembershipPayment
from
squarepay.dispense
import
get_item_price
from
.models
import
Member
,
Membership
,
get_membership_choices
,
MEMBERSHIP_TYPES
from
.models
import
Member
,
Membership
,
get_membership_choices
,
make_pending_membership
,
MEMBERSHIP_TYPES
from
.forms
import
MyModelForm
from
.views
import
MyUpdateView
from
.approve
import
make_pending_membership
"""
First step: enter an email address and some details (to fill at least a Member model) to create a pending membership.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment