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
8bc41d1d
Commit
8bc41d1d
authored
Jul 13, 2019
by
Joren Vrancken
Browse files
Merge branch 'fix/url-resolving' into 'master'
Fix url resolving See merge request
!1305
parents
3b4003e1
93232a55
Changes
3
Hide whitespace changes
Inline
Side-by-side
website/activemembers/urls.py
View file @
8bc41d1d
...
...
@@ -10,16 +10,16 @@ from activemembers.views import (
app_name
=
"activemembers"
urlpatterns
=
[
path
(
'committees/'
,
CommitteeIndexView
.
as_view
(),
name
=
'committees'
),
path
(
'committees/<int:pk>/'
,
CommitteeDetailView
.
as_view
(),
name
=
'committee'
),
path
(
'
societi
es/'
,
Society
IndexView
.
as_view
(),
name
=
'
societi
es'
),
path
(
'
committe
es/'
,
Committee
IndexView
.
as_view
(),
name
=
'
committe
es'
),
path
(
'societies/<int:pk>/'
,
SocietyDetailView
.
as_view
(),
name
=
'society'
),
path
(
'
board
s/'
,
Board
IndexView
.
as_view
(),
name
=
'
board
s'
),
path
(
'
societie
s/'
,
Society
IndexView
.
as_view
(),
name
=
'
societie
s'
),
re_path
(
r
'boards/(?P<since>\d{4})-(?P<until>\d{4})/$'
,
BoardDetailView
.
as_view
(),
name
=
'board'
),
path
(
'boards/'
,
BoardIndexView
.
as_view
(),
name
=
'boards'
),
]
website/education/urls.py
View file @
8bc41d1d
...
...
@@ -16,13 +16,12 @@ urlpatterns = [
path
(
'education/'
,
include
([
path
(
'books/'
,
BookInfoView
.
as_view
(),
name
=
"books"
),
path
(
'courses/'
,
include
([
path
(
''
,
CourseIndexView
.
as_view
(),
name
=
"courses"
),
path
(
'<int:pk>/'
,
include
([
path
(
''
,
CourseDetailView
.
as_view
(),
name
=
"course"
),
path
(
'exam/upload/'
,
ExamCreateView
.
as_view
(),
name
=
"submit-exam"
),
path
(
'summary/upload/'
,
SummaryCreateView
.
as_view
(),
name
=
"submit-summary"
),
path
(
''
,
CourseDetailView
.
as_view
(),
name
=
"course"
),
])),
path
(
'exam/<int:pk>/'
,
ExamDetailView
.
as_view
,
name
=
"exam"
),
path
(
'summary/(<int:pk>/'
,
SummaryDetailView
.
as_view
(),
...
...
@@ -31,6 +30,7 @@ urlpatterns = [
name
=
"submit-exam"
),
path
(
'summary/upload/'
,
SummaryCreateView
.
as_view
(),
name
=
"submit-summary"
),
path
(
''
,
CourseIndexView
.
as_view
(),
name
=
"courses"
),
])),
path
(
'student-participation/'
,
StudentParticipantView
.
as_view
(),
name
=
"student-participation"
),
...
...
website/members/urls.py
View file @
8bc41d1d
...
...
@@ -12,25 +12,25 @@ app_name = "members"
urlpatterns
=
[
path
(
'members/'
,
include
([
path
(
''
,
MembersIndex
.
as_view
(),
name
=
'index'
),
path
(
'<slug:filter>/'
,
MembersIndex
.
as_view
(),
name
=
'index'
),
path
(
'statistics/'
,
StatisticsView
.
as_view
(),
name
=
'statistics'
),
path
(
'profile/<int:pk>'
,
ProfileDetailView
.
as_view
(),
name
=
'profile'
),
path
(
'<slug:filter>/'
,
MembersIndex
.
as_view
(),
name
=
'index'
),
path
(
''
,
MembersIndex
.
as_view
(),
name
=
'index'
),
])),
path
(
'user/'
,
include
([
path
(
''
,
UserAccountView
.
as_view
(),
name
=
'user'
),
path
(
'edit-profile/'
,
UserProfileUpdateView
.
as_view
(),
name
=
'edit-profile'
),
path
(
'change-email/'
,
EmailChangeFormView
.
as_view
(),
name
=
'email-change'
),
path
(
'change-email/verify/<uuid:key>/'
,
EmailChangeVerifyView
.
as_view
(),
name
=
'email-change-verify'
),
path
(
'change-email/confirm/<uuid:key>/'
,
EmailChangeConfirmView
.
as_view
(),
name
=
'email-change-confirm'
),
path
(
'change-email/'
,
EmailChangeFormView
.
as_view
(),
name
=
'email-change'
),
path
(
''
,
UserAccountView
.
as_view
(),
name
=
'user'
),
])),
]
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