update dependencies

This commit is contained in:
bkfox
2019-05-11 15:15:57 +02:00
parent 1ebafb5241
commit a951d7a319
13 changed files with 90 additions and 79 deletions

View File

@ -119,17 +119,17 @@ INSTALLED_APPS = (
'aircox_cms',
'jet',
'wagtail.wagtailforms',
'wagtail.wagtailredirects',
'wagtail.wagtailembeds',
'wagtail.wagtailsites',
'wagtail.wagtailusers',
'wagtail.wagtailsnippets',
'wagtail.wagtaildocs',
'wagtail.wagtailimages',
'wagtail.wagtailsearch',
'wagtail.wagtailadmin',
'wagtail.wagtailcore',
'wagtail.contrib.forms',
'wagtail.contrib.redirects',
'wagtail.embeds',
'wagtail.sites',
'wagtail.users',
'wagtail.snippets',
'wagtail.documents',
'wagtail.images',
'wagtail.search',
'wagtail.admin',
'wagtail.core',
'wagtail.contrib.settings',
'wagtail.contrib.modeladmin',
@ -157,8 +157,8 @@ MIDDLEWARE = (
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django.middleware.security.SecurityMiddleware',
'wagtail.wagtailcore.middleware.SiteMiddleware',
'wagtail.wagtailredirects.middleware.RedirectMiddleware',
'wagtail.core.middleware.SiteMiddleware',
'wagtail.contrib.redirects.middleware.RedirectMiddleware',
'aircox.middleware.AircoxMiddleware'
)

View File

@ -13,37 +13,41 @@ Including another URLconf
1. Add an import: from blog import urls as blog_urls
2. Add a URL to urlpatterns: url(r'^blog/', include(blog_urls))
"""
from django.conf.urls import include, url
from django.conf import settings
from django.urls import include, path, re_path
from django.contrib import admin
from instance import settings
from wagtail.wagtailadmin import urls as wagtailadmin_urls
from wagtail.wagtaildocs import urls as wagtaildocs_urls
from wagtail.wagtailcore import urls as wagtail_urls
from wagtail.wagtailimages.views.serve import ServeView
from wagtail.admin import urls as wagtailadmin_urls
from wagtail.documents import urls as wagtaildocs_urls
from wagtail.core import urls as wagtail_urls
from wagtail.images.views.serve import ServeView
import aircox.urls
try:
urlpatterns = [
path('jet/', include('jet.urls', 'jet')),
path('admin/', admin.site.urls),
path('aircox/', include(aircox.urls.urls)),
urlpatterns = [
url(r'^jet/', include('jet.urls', 'jet')),
url(r'^admin/', include(admin.site.urls)),
url(r'^aircox/', include(aircox.urls.urls)),
# cms
path('cms/', include(wagtailadmin_urls)),
path('documents/', include(wagtaildocs_urls)),
re_path( r'^images/([^/]*)/(\d*)/([^/]*)/[^/]*$', ServeView.as_view(),
name='wagtailimages_serve'),
]
# cms
url(r'^cms/', include(wagtailadmin_urls)),
url(r'^documents/', include(wagtaildocs_urls)),
url( r'^images/([^/]*)/(\d*)/([^/]*)/[^/]*$', ServeView.as_view(),
name='wagtailimages_serve'),
]
if settings.DEBUG:
from django.views.static import serve
urlpatterns.append(
url(r'^media/(?P<path>.*)$', serve,
{'document_root': settings.MEDIA_ROOT, 'show_indexes':True}
if settings.DEBUG:
from django.views.static import serve
urlpatterns.append(
re_path(r'^media/(?P<path>.*)$', serve,
{'document_root': settings.MEDIA_ROOT, 'show_indexes':True}
)
)
)
urlpatterns.append(url(r'', include(wagtail_urls)))
urlpatterns.append(re_path(r'', include(wagtail_urls)))
except Exception as e:
import traceback
traceback.print_exc()