diff options
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -166,16 +166,12 @@ trogglepatterns = [ # setting LOGIN_URL = '/accounts/login/' is default. # NB setting url pattern name to 'login' instea dof 'expologin' with override Django, see https://docs.djangoproject.com/en/dev/topics/http/urls/#naming-url-patterns - path('accounts/logout/', expologout, name='expologout'), # same as in django.contrib.auth.urls - path('accounts/login/', expologin, name='expologin'), # same as in django.contrib.auth.urls - path("accounts/register", register, name="register"), - #path("accounts/register", SignUpView.as_view(), name="signup"), + path('accounts/logout/', expologout, name='expologout'), # same as in django.contrib.auth.urls + path('accounts/login/', expologin, name='expologin'), # same as in django.contrib.auth.urls + path("accounts/register/", register, name="register"), path('accounts/', include('django.contrib.auth.urls')), # see site-packages\registration\auth_urls_classes.py - - path('person/<slug:slug>', person, name="person"), - #re_path(r'^person/(?P<first_name>[A-Z]*[a-z\-\'&;]*)[^a-zA-Z]*(?P<last_name>[a-z\-\']*[^a-zA-Z]*[\-]*[A-Z]*[a-zA-Z\-&;]*)/?', person, name="person"), - #re_path(r'^personexpedition/(?P<first_name>[A-Z]*[a-z&;]*)[^a-zA-Z]*(?P<last_name>[A-Z]*[a-zA-Z&;]*)/(?P<year>\d+)/?$', personexpedition, name="personexpedition"), + path('person/<slug:slug>', person, name="person"), path('personexpedition/<slug:slug>/<int:year>', personexpedition, name="personexpedition"), # Expedition master page & API exports |