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
d9c5a1e5
Verified
Commit
d9c5a1e5
authored
May 31, 2018
by
Sébastiaan Versteeg
Browse files
Fix settings import to the right module
parent
dc43cab9
Changes
13
Hide whitespace changes
Inline
Side-by-side
website/events/api/serializers.py
View file @
d9c5a1e5
...
...
@@ -11,7 +11,7 @@ from events import services
from
events.exceptions
import
RegistrationError
from
events.models
import
Event
,
Registration
,
RegistrationInformationField
from
pizzas.models
import
PizzaEvent
from
thaliawebsite
.settings
import
settings
from
thaliawebsite
import
settings
from
thaliawebsite.templatetags.bleach_tags
import
bleach
...
...
website/events/models.py
View file @
d9c5a1e5
...
...
@@ -8,7 +8,7 @@ from django.utils.translation import ugettext_lazy as _
from
django.utils.text
import
format_lazy
from
tinymce.models
import
HTMLField
from
thaliawebsite
.settings
import
settings
from
thaliawebsite
import
settings
from
utils.translation
import
ModelTranslateMeta
,
MultilingualField
...
...
website/mailinglists/services.py
View file @
d9c5a1e5
...
...
@@ -2,7 +2,7 @@ from django.utils import timezone
from
activemembers.models
import
CommitteeMembership
,
Mentorship
from
members.models
import
Member
from
thaliawebsite
.settings
import
settings
from
thaliawebsite
import
settings
from
utils.snippets
import
datetime_to_lectureyear
...
...
website/members/emails.py
View file @
d9c5a1e5
...
...
@@ -7,7 +7,7 @@ from django.utils.datetime_safe import datetime
from
django.utils.translation
import
ugettext
as
_
from
members.models
import
Member
from
thaliawebsite
.settings
import
settings
from
thaliawebsite
import
settings
def
send_membership_announcement
(
dry_run
=
False
):
...
...
website/newsletters/emails.py
View file @
d9c5a1e5
...
...
@@ -5,7 +5,7 @@ from django.utils import translation
from
members.models
import
Member
from
partners.models
import
Partner
from
thaliawebsite
.settings
import
settings
from
thaliawebsite
import
settings
def
send_newsletter
(
request
,
newsletter
):
...
...
website/registrations/emails.py
View file @
d9c5a1e5
...
...
@@ -6,7 +6,7 @@ from django.urls import reverse
from
django.utils
import
translation
from
django.utils.translation
import
ugettext_lazy
as
_
from
thaliawebsite
.settings
import
settings
from
thaliawebsite
import
settings
from
.
import
models
...
...
website/registrations/models.py
View file @
d9c5a1e5
...
...
@@ -9,7 +9,7 @@ from django.utils import timezone
from
django.utils.translation
import
ugettext_lazy
as
_
from
members.models
import
Membership
,
Profile
from
thaliawebsite
.settings
import
settings
from
thaliawebsite
import
settings
from
.
import
emails
...
...
website/registrations/services.py
View file @
d9c5a1e5
...
...
@@ -10,7 +10,7 @@ from django.utils import timezone
import
members
from
members.models
import
Membership
,
Profile
from
payments.models
import
Payment
from
thaliawebsite
.settings
import
settings
from
thaliawebsite
import
settings
from
utils.snippets
import
datetime_to_lectureyear
from
.
import
emails
from
.models
import
Entry
,
Registration
,
Renewal
...
...
website/registrations/tests/test_emails.py
View file @
d9c5a1e5
...
...
@@ -14,7 +14,7 @@ from payments.models import Payment
from
registrations
import
emails
from
registrations.emails
import
_send_email
from
registrations.models
import
Registration
,
Renewal
from
thaliawebsite
.settings
import
settings
from
thaliawebsite
import
settings
class
EmailsTest
(
TestCase
):
...
...
website/registrations/tests/test_services.py
View file @
d9c5a1e5
...
...
@@ -11,7 +11,7 @@ from members.models import Member, Membership
from
payments.models
import
Payment
from
registrations
import
services
from
registrations.models
import
Entry
,
Registration
,
Renewal
from
thaliawebsite
.settings
import
settings
from
thaliawebsite
import
settings
from
utils.snippets
import
datetime_to_lectureyear
...
...
website/registrations/tests/test_views.py
View file @
d9c5a1e5
...
...
@@ -18,7 +18,7 @@ from members.models import Membership
from
registrations
import
views
from
registrations.models
import
Entry
,
Registration
,
Renewal
from
registrations.views
import
RenewalFormView
from
thaliawebsite
.settings
import
settings
from
thaliawebsite
import
settings
def
_get_mock_request
(
method
=
'GET'
,
is_staff
=
False
,
...
...
website/registrations/views.py
View file @
d9c5a1e5
...
...
@@ -16,7 +16,7 @@ from django.views.generic import FormView
from
django.views.generic.base
import
TemplateResponseMixin
,
TemplateView
from
members.models
import
Membership
from
thaliawebsite
.settings
import
settings
from
thaliawebsite
import
settings
from
.
import
emails
,
forms
,
services
from
.models
import
Entry
,
Registration
,
Renewal
...
...
website/thaliawebsite/api/services.py
View file @
d9c5a1e5
from
thaliawebsite
.settings
import
settings
from
thaliawebsite
import
settings
from
utils.templatetags.thumbnail
import
thumbnail
...
...
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