diff --git a/rugwebsite/__init__.py b/rugwebsite/__init__.py index 42c313b..997791c 100644 --- a/rugwebsite/__init__.py +++ b/rugwebsite/__init__.py @@ -1 +1 @@ -__version__ = '0.1.35' +__version__ = '0.1.36' diff --git a/rugwebsite/gdpr_urls.py b/rugwebsite/gdpr_urls.py new file mode 100644 index 0000000..52327a1 --- /dev/null +++ b/rugwebsite/gdpr_urls.py @@ -0,0 +1,11 @@ +from django.conf.urls import url +from rugwebsite.views import gdpr, gdpr_request_delete, gdpr_delete, gdpr_agree, gdpr_create_agree, gdpr_ask_agreement + +urlpatterns = [ + url(r'/$', gdpr, name='gdpr'), + url(r'request-delete/$', gdpr_request_delete, name='gdpr-request-delete'), + url(r'delete/(?P[^/]+)/(?P[a-zA-Z0-9]{32})/$', gdpr_delete, name='gdpr-delete'), + url(r'agree/(?P[^/]+)/(?P[a-zA-Z0-9]{32})/$', gdpr_agree, name='gdpr-agree'), + url(r'create-agree/$', gdpr_create_agree, name='gdpr-create-agree'), + url(r'ask-for-agreement/$', gdpr_ask_agreement, name='gdpr-ask-for-agreement'), +] diff --git a/rugwebsite/urls.py b/rugwebsite/urls.py index 751c549..b8865c6 100755 --- a/rugwebsite/urls.py +++ b/rugwebsite/urls.py @@ -1,10 +1,16 @@ from django.conf.urls import include, url import django_saml2_pro_auth.urls as saml_urls -from rugwebsite.views import home, gdpr, request_gdpr_delete +from rugwebsite.views import home, gdpr, gdpr_request_delete, gdpr_delete, gdpr_agree, gdpr_create_agree, \ + gdpr_ask_agreement urlpatterns = [ url(r'gdpr/$', gdpr, name='gdpr'), - url(r'gdpr-forget-me/$', request_gdpr_delete, name='gdpr-forget-me'), + url(r'gdpr-request-delete/$', gdpr_request_delete, name='gdpr-request-delete'), + url(r'gdpr-delete/(?P[^/]+)/(?P[a-zA-Z0-9]{32})/$', gdpr_delete, name='gdpr-delete'), + url(r'gdpr-agree/(?P[^/]+)/(?P[a-zA-Z0-9]{32})/$', gdpr_agree, name='gdpr-agree'), + url(r'gdpr-create-agree/$', gdpr_create_agree, name='gdpr-create-agree'), + url(r'gdpr-ask-for-agreement/$', gdpr_ask_agreement, name='gdpr-ask-for-agreement'), + url(r'', include(saml_urls, namespace='saml')), url(r'$', home), ]