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
f15fede5
Unverified
Commit
f15fede5
authored
May 31, 2018
by
Thom Wiggers
📐
Browse files
Never import thaliawebsite.settings directly
parent
73fa3a39
Changes
16
Hide whitespace changes
Inline
Side-by-side
website/events/api/serializers.py
View file @
f15fede5
from
django.conf
import
settings
from
django.templatetags.static
import
static
from
django.urls
import
reverse
from
django.utils
import
timezone
...
...
@@ -11,7 +12,6 @@ from events import services
from
events.exceptions
import
RegistrationError
from
events.models
import
Event
,
Registration
,
RegistrationInformationField
from
pizzas.models
import
PizzaEvent
from
thaliawebsite
import
settings
from
thaliawebsite.templatetags.bleach_tags
import
bleach
...
...
website/events/models.py
View file @
f15fede5
from
django.conf
import
settings
from
django.core
import
validators
from
django.core.exceptions
import
ValidationError
,
ObjectDoesNotExist
from
django.db
import
models
...
...
@@ -8,7 +9,6 @@ from django.utils.translation import ugettext_lazy as _
from
django.utils.text
import
format_lazy
from
tinymce.models
import
HTMLField
from
thaliawebsite
import
settings
from
utils.translation
import
ModelTranslateMeta
,
MultilingualField
...
...
website/mailinglists/api/permissions.py
View file @
f15fede5
from
rest_framework
import
permission
s
from
django.conf
import
setting
s
from
thaliawebsite
import
setting
s
from
rest_framework
import
permission
s
class
MailingListPermission
(
permissions
.
BasePermission
):
...
...
website/mailinglists/services.py
View file @
f15fede5
from
django.conf
import
settings
from
django.utils
import
timezone
from
activemembers.models
import
CommitteeMembership
,
Mentorship
from
members.models
import
Member
from
thaliawebsite
import
settings
from
utils.snippets
import
datetime_to_lectureyear
...
...
website/members/emails.py
View file @
f15fede5
from
django.conf
import
settings
from
datetime
import
timedelta
from
django.core
import
mail
...
...
@@ -8,7 +9,6 @@ from django.utils.translation import ugettext as _
from
django.template.defaultfilters
import
floatformat
from
members.models
import
Member
from
thaliawebsite
import
settings
def
send_membership_announcement
(
dry_run
=
False
):
...
...
website/newsletters/emails.py
View file @
f15fede5
"""The emails defined by the newsletters package"""
from
django.conf
import
settings
from
django.core.mail
import
EmailMultiAlternatives
from
django.template.loader
import
get_template
from
django.utils
import
translation
from
members.models
import
Member
from
partners.models
import
Partner
from
thaliawebsite
import
settings
def
send_newsletter
(
request
,
newsletter
):
...
...
website/partners/emails.py
View file @
f15fede5
import
datetime
from
django.conf
import
settings
from
django.core.mail
import
EmailMessage
from
django.utils
import
timezone
from
partners.models
import
Vacancy
from
thaliawebsite
import
settings
def
send_vacancy_expiration_notifications
(
dry_run
=
False
):
...
...
website/pushnotifications/models.py
View file @
f15fede5
from
__future__
import
unicode_literals
from
django.conf
import
settings
as
django_settings
from
django.conf
import
settings
from
django.db
import
models
from
django.utils.translation
import
ugettext_lazy
as
_
from
django.utils.translation
import
override
from
pyfcm
import
FCMNotification
from
thaliawebsite
import
settings
from
utils.translation
import
MultilingualField
,
ModelTranslateMeta
...
...
@@ -39,7 +38,7 @@ class Device(models.Model):
verbose_name
=
_
(
"active"
),
default
=
True
,
help_text
=
_
(
"Inactive devices will not be sent notifications"
)
)
user
=
models
.
ForeignKey
(
django_
settings
.
AUTH_USER_MODEL
,
user
=
models
.
ForeignKey
(
settings
.
AUTH_USER_MODEL
,
on_delete
=
models
.
CASCADE
,
blank
=
False
,
null
=
False
)
...
...
@@ -81,7 +80,7 @@ class Message(models.Model, metaclass=ModelTranslateMeta):
(
BOARD
,
_
(
"Board"
)),
)
users
=
models
.
ManyToManyField
(
django_
settings
.
AUTH_USER_MODEL
)
users
=
models
.
ManyToManyField
(
settings
.
AUTH_USER_MODEL
)
title
=
MultilingualField
(
models
.
CharField
,
max_length
=
150
,
...
...
website/registrations/emails.py
View file @
f15fede5
"""The emails defined by the registrations package"""
from
django.conf
import
settings
from
django.core
import
mail
from
django.template
import
loader
from
django.template.defaultfilters
import
floatformat
...
...
@@ -6,7 +7,6 @@ from django.urls import reverse
from
django.utils
import
translation
from
django.utils.translation
import
ugettext_lazy
as
_
from
thaliawebsite
import
settings
from
.
import
models
...
...
website/registrations/models.py
View file @
f15fede5
"""The models defined by the registrations package"""
import
uuid
from
django.conf
import
settings
from
django.contrib.auth
import
get_user_model
from
django.core
import
validators
from
django.core.exceptions
import
ValidationError
...
...
@@ -9,8 +10,7 @@ from django.utils import timezone
from
django.utils.translation
import
ugettext_lazy
as
_
from
members.models
import
Membership
,
Profile
from
thaliawebsite
import
settings
from
.
import
emails
from
registrations
import
emails
class
Entry
(
models
.
Model
):
...
...
website/registrations/services.py
View file @
f15fede5
...
...
@@ -3,6 +3,7 @@ import string
import
unicodedata
from
datetime
import
timedelta
from
django.conf
import
settings
from
django.contrib.auth
import
get_user_model
from
django.db.models
import
Q
from
django.utils
import
timezone
...
...
@@ -10,10 +11,9 @@ from django.utils import timezone
import
members
from
members.models
import
Membership
,
Profile
from
payments.models
import
Payment
from
thaliawebsite
import
settings
from
utils.snippets
import
datetime_to_lectureyear
from
.
import
emails
from
.models
import
Entry
,
Registration
,
Renewal
from
registrations
import
emails
from
registrations
.models
import
Entry
,
Registration
,
Renewal
def
_generate_username
(
registration
):
...
...
website/registrations/tests/test_emails.py
View file @
f15fede5
import
uuid
from
unittest
import
mock
from
django.conf
import
settings
from
django.core
import
mail
from
django.template
import
loader
from
django.template.defaultfilters
import
floatformat
...
...
@@ -14,7 +15,6 @@ from payments.models import Payment
from
registrations
import
emails
from
registrations.emails
import
_send_email
from
registrations.models
import
Registration
,
Renewal
from
thaliawebsite
import
settings
class
EmailsTest
(
TestCase
):
...
...
website/registrations/tests/test_services.py
View file @
f15fede5
from
datetime
import
timedelta
from
unittest
import
mock
from
django.conf
import
settings
from
django.contrib.auth
import
get_user_model
from
django.core
import
mail
from
django.test
import
TestCase
...
...
@@ -11,7 +12,6 @@ from members.models import Member, Membership
from
payments.models
import
Payment
from
registrations
import
services
from
registrations.models
import
Entry
,
Registration
,
Renewal
from
thaliawebsite
import
settings
from
utils.snippets
import
datetime_to_lectureyear
...
...
website/registrations/tests/test_views.py
View file @
f15fede5
from
unittest
import
mock
from
unittest.mock
import
MagicMock
,
Mock
from
django.conf
import
settings
from
django.contrib
import
messages
from
django.contrib.admin.utils
import
model_ngettext
from
django.contrib.auth
import
get_user_model
...
...
@@ -18,7 +19,6 @@ from members.models import Membership
from
registrations
import
views
from
registrations.models
import
Entry
,
Registration
,
Renewal
from
registrations.views
import
RenewalFormView
from
thaliawebsite
import
settings
def
_get_mock_request
(
method
=
'GET'
,
is_staff
=
False
,
...
...
website/registrations/views.py
View file @
f15fede5
"""Views provided by the registrations package"""
from
django.conf
import
settings
from
django.contrib
import
messages
from
django.contrib.admin.utils
import
model_ngettext
from
django.contrib.admin.views.decorators
import
staff_member_required
...
...
@@ -16,7 +17,6 @@ from django.views.generic import FormView
from
django.views.generic.base
import
TemplateResponseMixin
,
TemplateView
from
members.models
import
Membership
from
thaliawebsite
import
settings
from
.
import
emails
,
forms
,
services
from
.models
import
Entry
,
Registration
,
Renewal
...
...
website/thaliawebsite/api/services.py
View file @
f15fede5
from
thaliawebsite
import
settings
from
django.conf
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