Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
6d97c89f
Unverified
Commit
6d97c89f
authored
Jan 19, 2018
by
Thom Wiggers
📐
Browse files
Fix imports
parent
84ce8916
Changes
7
Hide whitespace changes
Inline
Side-by-side
website/registrations/admin.py
View file @
6d97c89f
...
...
@@ -3,8 +3,7 @@ from django.contrib.admin.utils import model_ngettext
from
django.utils.html
import
format_html
from
django.utils.translation
import
ugettext_lazy
as
_
from
registrations
import
services
from
.
import
services
from
.models
import
Entry
,
Payment
,
Registration
,
Renewal
...
...
website/registrations/emails.py
View file @
6d97c89f
...
...
@@ -5,9 +5,10 @@ from django.urls import reverse
from
django.utils
import
translation
from
django.utils.translation
import
ugettext_lazy
as
_
from
registrations
import
models
from
thaliawebsite.settings
import
settings
from
.
import
models
def
send_registration_email_confirmation
(
registration
):
with
translation
.
override
(
registration
.
language
):
...
...
website/registrations/forms.py
View file @
6d97c89f
...
...
@@ -2,7 +2,7 @@ from django import forms
from
django.utils
import
timezone
from
django.utils.translation
import
ugettext_lazy
as
_
from
registrations
.models
import
Registration
,
Renewal
from
.models
import
Registration
,
Renewal
class
MemberRegistrationForm
(
forms
.
ModelForm
):
...
...
website/registrations/models.py
View file @
6d97c89f
...
...
@@ -10,9 +10,10 @@ from django.utils import timezone
from
django.utils.translation
import
ugettext_lazy
as
_
from
members.models
import
Membership
,
Profile
from
registrations
import
emails
from
thaliawebsite.settings
import
settings
from
.
import
emails
class
Entry
(
models
.
Model
):
...
...
website/registrations/services.py
View file @
6d97c89f
...
...
@@ -8,10 +8,10 @@ from django.utils import timezone
import
members
from
members.models
import
Membership
,
Profile
from
registrations
import
emails
from
thaliawebsite.settings
import
settings
from
utils.snippets
import
datetime_to_lectureyear
from
.
import
emails
from
.models
import
Entry
,
Payment
,
Registration
,
Renewal
...
...
website/registrations/urls.py
View file @
6d97c89f
from
django.conf.urls
import
url
from
django.views.generic
import
TemplateView
from
registrations
.views
import
(
BecomeAMemberView
,
ConfirmEmailView
,
EntryAdminView
,
MemberRegistrationFormView
,
PaymentAdminView
,
RenewalFormView
)
from
.views
import
(
BecomeAMemberView
,
ConfirmEmailView
,
EntryAdminView
,
MemberRegistrationFormView
,
PaymentAdminView
,
RenewalFormView
)
app_name
=
"registrations"
...
...
website/registrations/views.py
View file @
6d97c89f
...
...
@@ -15,10 +15,11 @@ from django.views.generic import FormView
from
django.views.generic.base
import
TemplateResponseMixin
,
TemplateView
from
members.models
import
Membership
from
registrations
import
emails
,
forms
,
services
from
registrations.models
import
Entry
,
Payment
,
Registration
,
Renewal
from
thaliawebsite.settings
import
settings
from
.
import
emails
,
forms
,
services
from
.models
import
Entry
,
Payment
,
Registration
,
Renewal
class
BecomeAMemberView
(
TemplateView
):
template_name
=
'registrations/become_a_member.html'
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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