black on urls.py
This commit is contained in:
Yohan Boniface
parent
e60227f7da
commit
cfcb83dbfb
1 changed files with 119 additions and 61 deletions
180
umap/urls.py
180
umap/urls.py
|
|
@ -5,89 +5,147 @@ from django.conf.urls.static import static
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.contrib.auth import views as auth_views
|
from django.contrib.auth import views as auth_views
|
||||||
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
|
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
|
||||||
from django.views.decorators.cache import (cache_control, cache_page,
|
from django.views.decorators.cache import cache_control, cache_page, never_cache
|
||||||
never_cache)
|
|
||||||
from django.views.decorators.csrf import ensure_csrf_cookie
|
from django.views.decorators.csrf import ensure_csrf_cookie
|
||||||
|
|
||||||
from . import views
|
from . import views
|
||||||
from .decorators import (jsonize_view, login_required_if_not_anonymous_allowed,
|
from .decorators import (
|
||||||
map_permissions_check)
|
jsonize_view,
|
||||||
|
login_required_if_not_anonymous_allowed,
|
||||||
|
map_permissions_check,
|
||||||
|
)
|
||||||
from .utils import decorated_patterns
|
from .utils import decorated_patterns
|
||||||
|
|
||||||
admin.autodiscover()
|
admin.autodiscover()
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
re_path(r'^admin/', admin.site.urls),
|
re_path(r"^admin/", admin.site.urls),
|
||||||
re_path('', include('social_django.urls', namespace='social')),
|
re_path("", include("social_django.urls", namespace="social")),
|
||||||
re_path(r'^m/(?P<pk>\d+)/$', views.MapShortUrl.as_view(),
|
re_path(r"^m/(?P<pk>\d+)/$", views.MapShortUrl.as_view(), name="map_short_url"),
|
||||||
name='map_short_url'),
|
re_path(r"^ajax-proxy/$", cache_page(180)(views.ajax_proxy), name="ajax-proxy"),
|
||||||
re_path(r'^ajax-proxy/$', cache_page(180)(views.ajax_proxy),
|
re_path(
|
||||||
name='ajax-proxy'),
|
r"^change-password/",
|
||||||
re_path(r'^change-password/', auth_views.PasswordChangeView.as_view(),
|
auth_views.PasswordChangeView.as_view(),
|
||||||
{'template_name': 'umap/password_change.html'},
|
{"template_name": "umap/password_change.html"},
|
||||||
name='password_change'),
|
name="password_change",
|
||||||
re_path(r'^change-password-done/', auth_views.PasswordChangeDoneView.as_view(),
|
),
|
||||||
{'template_name': 'umap/password_change_done.html'},
|
re_path(
|
||||||
name='password_change_done'),
|
r"^change-password-done/",
|
||||||
re_path(r'^i18n/', include('django.conf.urls.i18n')),
|
auth_views.PasswordChangeDoneView.as_view(),
|
||||||
re_path(r'^agnocomplete/', include('agnocomplete.urls')),
|
{"template_name": "umap/password_change_done.html"},
|
||||||
|
name="password_change_done",
|
||||||
|
),
|
||||||
|
re_path(r"^i18n/", include("django.conf.urls.i18n")),
|
||||||
|
re_path(r"^agnocomplete/", include("agnocomplete.urls")),
|
||||||
]
|
]
|
||||||
|
|
||||||
i18n_urls = [
|
i18n_urls = [
|
||||||
re_path(r'^login/$', jsonize_view(auth_views.LoginView.as_view()), name='login'), # noqa
|
re_path(
|
||||||
re_path(r'^login/popup/end/$', views.LoginPopupEnd.as_view(),
|
r"^login/$", jsonize_view(auth_views.LoginView.as_view()), name="login"
|
||||||
name='login_popup_end'),
|
),
|
||||||
re_path(r'^logout/$', views.logout, name='logout'),
|
re_path(
|
||||||
re_path(r'^map/(?P<pk>\d+)/geojson/$', views.MapViewGeoJSON.as_view(),
|
r"^login/popup/end/$", views.LoginPopupEnd.as_view(), name="login_popup_end"
|
||||||
name='map_geojson'),
|
),
|
||||||
re_path(r'^map/anonymous-edit/(?P<signature>.+)$',
|
re_path(r"^logout/$", views.logout, name="logout"),
|
||||||
views.MapAnonymousEditUrl.as_view(), name='map_anonymous_edit_url'),
|
re_path(
|
||||||
re_path(r'^pictogram/json/$', views.PictogramJSONList.as_view(),
|
r"^map/(?P<pk>\d+)/geojson/$",
|
||||||
name='pictogram_list_json'),
|
views.MapViewGeoJSON.as_view(),
|
||||||
|
name="map_geojson",
|
||||||
|
),
|
||||||
|
re_path(
|
||||||
|
r"^map/anonymous-edit/(?P<signature>.+)$",
|
||||||
|
views.MapAnonymousEditUrl.as_view(),
|
||||||
|
name="map_anonymous_edit_url",
|
||||||
|
),
|
||||||
|
re_path(
|
||||||
|
r"^pictogram/json/$",
|
||||||
|
views.PictogramJSONList.as_view(),
|
||||||
|
name="pictogram_list_json",
|
||||||
|
),
|
||||||
]
|
]
|
||||||
i18n_urls += decorated_patterns(cache_control(must_revalidate=True),
|
i18n_urls += decorated_patterns(
|
||||||
re_path(r'^datalayer/(?P<pk>[\d]+)/$', views.DataLayerView.as_view(), name='datalayer_view'), # noqa
|
cache_control(must_revalidate=True),
|
||||||
re_path(r'^datalayer/(?P<pk>[\d]+)/versions/$', views.DataLayerVersions.as_view(), name='datalayer_versions'), # noqa
|
re_path(
|
||||||
re_path(r'^datalayer/(?P<pk>[\d]+)/(?P<name>[_\w]+.geojson)$', views.DataLayerVersion.as_view(), name='datalayer_version'), # noqa
|
r"^datalayer/(?P<pk>[\d]+)/$",
|
||||||
|
views.DataLayerView.as_view(),
|
||||||
|
name="datalayer_view",
|
||||||
|
),
|
||||||
|
re_path(
|
||||||
|
r"^datalayer/(?P<pk>[\d]+)/versions/$",
|
||||||
|
views.DataLayerVersions.as_view(),
|
||||||
|
name="datalayer_versions",
|
||||||
|
),
|
||||||
|
re_path(
|
||||||
|
r"^datalayer/(?P<pk>[\d]+)/(?P<name>[_\w]+.geojson)$",
|
||||||
|
views.DataLayerVersion.as_view(),
|
||||||
|
name="datalayer_version",
|
||||||
|
),
|
||||||
)
|
)
|
||||||
i18n_urls += decorated_patterns([ensure_csrf_cookie],
|
i18n_urls += decorated_patterns(
|
||||||
re_path(r'^map/(?P<slug>[-_\w]+)_(?P<pk>\d+)$', views.MapView.as_view(), name='map'), # noqa
|
[ensure_csrf_cookie],
|
||||||
re_path(r'^map/new/$', views.MapNew.as_view(), name='map_new'),
|
re_path(
|
||||||
|
r"^map/(?P<slug>[-_\w]+)_(?P<pk>\d+)$", views.MapView.as_view(), name="map"
|
||||||
|
),
|
||||||
|
re_path(r"^map/new/$", views.MapNew.as_view(), name="map_new"),
|
||||||
)
|
)
|
||||||
i18n_urls += decorated_patterns(
|
i18n_urls += decorated_patterns(
|
||||||
[login_required_if_not_anonymous_allowed, never_cache],
|
[login_required_if_not_anonymous_allowed, never_cache],
|
||||||
re_path(r'^map/create/$', views.MapCreate.as_view(), name='map_create'),
|
re_path(r"^map/create/$", views.MapCreate.as_view(), name="map_create"),
|
||||||
)
|
)
|
||||||
i18n_urls += decorated_patterns(
|
i18n_urls += decorated_patterns(
|
||||||
[map_permissions_check, never_cache],
|
[map_permissions_check, never_cache],
|
||||||
re_path(r'^map/(?P<map_id>[\d]+)/update/settings/$', views.MapUpdate.as_view(),
|
re_path(
|
||||||
name='map_update'),
|
r"^map/(?P<map_id>[\d]+)/update/settings/$",
|
||||||
re_path(r'^map/(?P<map_id>[\d]+)/update/permissions/$',
|
views.MapUpdate.as_view(),
|
||||||
views.UpdateMapPermissions.as_view(), name='map_update_permissions'),
|
name="map_update",
|
||||||
re_path(r'^map/(?P<map_id>[\d]+)/update/owner/$',
|
),
|
||||||
views.AttachAnonymousMap.as_view(), name='map_attach_owner'),
|
re_path(
|
||||||
re_path(r'^map/(?P<map_id>[\d]+)/update/delete/$',
|
r"^map/(?P<map_id>[\d]+)/update/permissions/$",
|
||||||
views.MapDelete.as_view(), name='map_delete'),
|
views.UpdateMapPermissions.as_view(),
|
||||||
re_path(r'^map/(?P<map_id>[\d]+)/update/clone/$',
|
name="map_update_permissions",
|
||||||
views.MapClone.as_view(), name='map_clone'),
|
),
|
||||||
re_path(r'^map/(?P<map_id>[\d]+)/datalayer/create/$',
|
re_path(
|
||||||
views.DataLayerCreate.as_view(), name='datalayer_create'),
|
r"^map/(?P<map_id>[\d]+)/update/owner/$",
|
||||||
re_path(r'^map/(?P<map_id>[\d]+)/datalayer/update/(?P<pk>\d+)/$',
|
views.AttachAnonymousMap.as_view(),
|
||||||
views.DataLayerUpdate.as_view(), name='datalayer_update'),
|
name="map_attach_owner",
|
||||||
re_path(r'^map/(?P<map_id>[\d]+)/datalayer/delete/(?P<pk>\d+)/$',
|
),
|
||||||
views.DataLayerDelete.as_view(), name='datalayer_delete'),
|
re_path(
|
||||||
|
r"^map/(?P<map_id>[\d]+)/update/delete/$",
|
||||||
|
views.MapDelete.as_view(),
|
||||||
|
name="map_delete",
|
||||||
|
),
|
||||||
|
re_path(
|
||||||
|
r"^map/(?P<map_id>[\d]+)/update/clone/$",
|
||||||
|
views.MapClone.as_view(),
|
||||||
|
name="map_clone",
|
||||||
|
),
|
||||||
|
re_path(
|
||||||
|
r"^map/(?P<map_id>[\d]+)/datalayer/create/$",
|
||||||
|
views.DataLayerCreate.as_view(),
|
||||||
|
name="datalayer_create",
|
||||||
|
),
|
||||||
|
re_path(
|
||||||
|
r"^map/(?P<map_id>[\d]+)/datalayer/update/(?P<pk>\d+)/$",
|
||||||
|
views.DataLayerUpdate.as_view(),
|
||||||
|
name="datalayer_update",
|
||||||
|
),
|
||||||
|
re_path(
|
||||||
|
r"^map/(?P<map_id>[\d]+)/datalayer/delete/(?P<pk>\d+)/$",
|
||||||
|
views.DataLayerDelete.as_view(),
|
||||||
|
name="datalayer_delete",
|
||||||
|
),
|
||||||
)
|
)
|
||||||
urlpatterns += i18n_patterns(
|
urlpatterns += i18n_patterns(
|
||||||
re_path(r'^$', views.home, name="home"),
|
re_path(r"^$", views.home, name="home"),
|
||||||
re_path(r'^showcase/$', cache_page(24 * 60 * 60)(views.showcase),
|
re_path(
|
||||||
name='maps_showcase'),
|
r"^showcase/$", cache_page(24 * 60 * 60)(views.showcase), name="maps_showcase"
|
||||||
re_path(r'^search/$', views.search, name="search"),
|
),
|
||||||
re_path(r'^about/$', views.about, name="about"),
|
re_path(r"^search/$", views.search, name="search"),
|
||||||
re_path(r'^user/(?P<username>.+)/$', views.user_maps, name='user_maps'),
|
re_path(r"^about/$", views.about, name="about"),
|
||||||
re_path(r'', include(i18n_urls)),
|
re_path(r"^user/(?P<username>.+)/$", views.user_maps, name="user_maps"),
|
||||||
|
re_path(r"", include(i18n_urls)),
|
||||||
)
|
)
|
||||||
|
|
||||||
if settings.DEBUG and settings.MEDIA_ROOT:
|
if settings.DEBUG and settings.MEDIA_ROOT:
|
||||||
urlpatterns += static(settings.MEDIA_URL,
|
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||||
document_root=settings.MEDIA_ROOT)
|
|
||||||
urlpatterns += staticfiles_urlpatterns()
|
urlpatterns += staticfiles_urlpatterns()
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue