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
38baaca8
Verified
Commit
38baaca8
authored
Jun 04, 2019
by
Sébastiaan Versteeg
Browse files
Fix timezone aware and add services code
parent
2209a1ec
Changes
4
Hide whitespace changes
Inline
Side-by-side
website/newsletters/emails.py
View file @
38baaca8
...
...
@@ -3,7 +3,8 @@
from
django.conf
import
settings
from
django.core.mail
import
EmailMultiAlternatives
from
django.template.loader
import
get_template
from
django.utils
import
translation
from
django.utils
import
translation
,
timezone
from
django.utils.timezone
import
make_aware
from
members.models
import
Member
from
newsletters
import
services
...
...
@@ -18,7 +19,15 @@ def send_newsletter(newsletter):
"""
partners
=
Partner
.
objects
.
filter
(
is_main_partner
=
True
)
main_partner
=
partners
[
0
]
if
len
(
partners
)
>
0
else
None
events
=
services
.
get_agenda
(
newsletter
.
date
)
if
newsletter
.
date
else
None
events
=
None
if
newsletter
.
date
:
datetime
=
make_aware
(
timezone
.
datetime
(
year
=
newsletter
.
date
.
year
,
month
=
newsletter
.
date
.
month
,
day
=
newsletter
.
date
.
day
,
))
if
newsletter
.
date
else
None
events
=
services
.
get_agenda
(
datetime
)
from_email
=
settings
.
NEWSLETTER_FROM_ADDRESS
html_template
=
get_template
(
'newsletters/email.html'
)
...
...
website/newsletters/management/commands/sendplannednewsletters.py
View file @
38baaca8
from
django.core.management.base
import
BaseCommand
from
django.utils
import
timezone
from
newsletters
import
email
s
from
newsletters
import
service
s
from
newsletters.models
import
Newsletter
...
...
@@ -13,6 +13,4 @@ class Command(BaseCommand):
sent
=
False
)
for
n
in
newsletters
:
emails
.
send_newsletter
(
n
)
n
.
sent
=
True
n
.
save
()
services
.
send_newsletter
(
n
)
website/newsletters/services.py
View file @
38baaca8
...
...
@@ -5,6 +5,7 @@ from django.template.loader import get_template
from
django.utils
import
translation
,
timezone
from
events.models
import
Event
from
newsletters
import
emails
from
partners.models
import
Partner
...
...
@@ -60,3 +61,9 @@ def get_agenda(start_date):
more_events
=
Event
.
objects
.
filter
(
end__gte
=
end_date
).
order_by
(
'start'
)
return
[
*
base_events
,
*
more_events
][:
10
]
return
base_events
def
send_newsletter
(
newsletter
):
emails
.
send_newsletter
(
newsletter
)
newsletter
.
sent
=
True
newsletter
.
save
()
website/newsletters/views.py
View file @
38baaca8
...
...
@@ -9,7 +9,7 @@ from django.shortcuts import get_object_or_404, redirect, render
from
django.utils.translation
import
activate
,
get_language_info
from
sendfile
import
sendfile
from
newsletters
import
emails
,
services
from
newsletters
import
services
from
newsletters.models
import
Newsletter
from
partners.models
import
Partner
...
...
@@ -95,9 +95,7 @@ def admin_send(request, pk):
return
redirect
(
newsletter
)
if
request
.
POST
:
emails
.
send_newsletter
(
newsletter
)
newsletter
.
sent
=
True
newsletter
.
save
()
services
.
send_newsletter
(
newsletter
)
return
redirect
(
'admin:newsletters_newsletter_changelist'
)
else
:
...
...
Luko van der Maas
@lukomaas
mentioned in commit
229fc1ed
·
Jun 05, 2019
mentioned in commit
229fc1ed
mentioned in commit 229fc1ed6c773b3b19e2c33f1caaf178e3bcbf2f
Toggle commit list
Luko van der Maas
@lukomaas
mentioned in commit
33ba9c96
·
Jun 05, 2019
mentioned in commit
33ba9c96
mentioned in commit 33ba9c96a07bdc00a575f751cc1d1864d236f959
Toggle commit list
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