From d7b5c674abbec427121b748d91d65c89a0a63f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sat, 9 Sep 2017 13:47:23 +0200 Subject: [PATCH] misc: adapt ckeditor inclusion for django 1.11 (#20917) --- combo/manager/urls.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/combo/manager/urls.py b/combo/manager/urls.py index 84b8807..9a7ed33 100644 --- a/combo/manager/urls.py +++ b/combo/manager/urls.py @@ -15,6 +15,10 @@ # along with this program. If not, see . from django.conf.urls import url, include +from django.contrib.admin.views.decorators import staff_member_required +from django.views.decorators.cache import never_cache + +import ckeditor.views as ckeditor_views from .. import plugins from . import views @@ -70,7 +74,10 @@ urlpatterns = [ url(r'^assets/delete$', views.asset_delete, name='combo-manager-asset-delete'), url(r'^assets/overwrite/$', views.asset_overwrite, name='combo-manager-asset-overwrite'), url(r'^assets/upload/$', views.asset_upload, name='combo-manager-asset-upload'), - url(r'^ckeditor/', include('ckeditor.urls')), + url(r'^ckeditor/upload/', staff_member_required(ckeditor_views.upload), + name='ckeditor_upload'), + url(r'^ckeditor/browse/', never_cache(staff_member_required(ckeditor_views.browse)), + name='ckeditor_browse'), ] urlpatterns = plugins.register_plugins_manager_urls(urlpatterns) -- 2.15.1