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
3f0c6fd8
Commit
3f0c6fd8
authored
Nov 23, 2016
by
Sébastiaan Versteeg
Browse files
Add legacy redirect for newsletters
parent
add7c976
Changes
3
Hide whitespace changes
Inline
Side-by-side
website/newsletters/urls.py
View file @
3f0c6fd8
...
...
@@ -7,4 +7,6 @@ app_name = "newsletters"
urlpatterns
=
[
url
(
'^(?P<pk>\d+)/$'
,
views
.
preview
,
name
=
'preview'
),
url
(
r
'admin/send/(?P<pk>\d+)/$'
,
views
.
admin_send
,
name
=
'admin-send'
),
url
(
'^(?P<year>\d+)/(?P<week>\d+)/nieuwsbrief.html'
,
views
.
legacy_redirect
,
name
=
'legacy-redirect'
)
]
website/newsletters/views.py
View file @
3f0c6fd8
...
...
@@ -7,6 +7,8 @@ from django.template import Context
from
django.template.loader
import
get_template
from
django.utils
import
translation
from
datetime
import
datetime
,
timedelta
,
date
from
members.models
import
Member
from
newsletters.models
import
Newsletter
from
partners.models
import
Partner
...
...
@@ -24,6 +26,17 @@ def preview(request, pk):
})
def
legacy_redirect
(
request
,
year
,
week
):
newsletter_date
=
datetime
.
strptime
(
'%s-%s-1'
%
(
year
,
week
),
'%Y-%W-%w'
)
if
date
(
int
(
year
),
1
,
4
).
isoweekday
()
>
4
:
newsletter_date
-=
timedelta
(
days
=
7
)
newsletter
=
get_object_or_404
(
Newsletter
,
date
=
newsletter_date
)
return
redirect
(
newsletter
.
get_absolute_url
(),
permanent
=
True
)
@
staff_member_required
@
permission_required
(
'newsletters.change_event'
)
def
admin_send
(
request
,
pk
):
...
...
website/thaliawebsite/urls.py
View file @
3f0c6fd8
...
...
@@ -57,6 +57,7 @@ urlpatterns = [
url
(
r
'^pizzas/'
,
include
(
'pizzas.urls'
)),
url
(
r
'^index\.php/events/ical/feed\.ics'
,
DeprecationFeed
()),
url
(
r
'^newsletters/'
,
include
(
'newsletters.urls'
)),
url
(
r
'^nieuwsbrief/'
,
include
(
'newsletters.urls'
)),
# for legacy reasons
url
(
r
'^association$'
,
TemplateView
.
as_view
(
template_name
=
'singlepages/association.html'
),
name
=
'association'
),
url
(
r
'^'
,
include
([
# 'association' menu
...
...
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