Merge branch 'fix/url-resolving' into 'master'

Fix url resolving

See merge request !1305

website/activemembers/urls.py

@@ -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('societies/',
-         SocietyIndexView.as_view(), name='societies'),
+    path('committees/',
+         CommitteeIndexView.as_view(), name='committees'),
     path('societies/<int:pk>/',
          SocietyDetailView.as_view(), name='society'),
-    path('boards/',
-         BoardIndexView.as_view(), name='boards'),
+    path('societies/',
+         SocietyIndexView.as_view(), name='societies'),
     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

@@ -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

@@ -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'),
     ])),
 ]