Project

General

Profile

0001-misc-adapt-ckeditor-inclusion-for-django-1.11-20917.patch

Frédéric Péters, 28 December 2017 03:07 PM

Download (1.52 KB)

View differences:

Subject: [PATCH] misc: adapt ckeditor inclusion for django 1.11 (#20917)

 combo/manager/urls.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
combo/manager/urls.py
15 15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16

  
17 17
from django.conf.urls import url, include
18
from django.contrib.admin.views.decorators import staff_member_required
19
from django.views.decorators.cache import never_cache
20

  
21
import ckeditor.views as ckeditor_views
18 22

  
19 23
from .. import plugins
20 24
from . import views
......
70 74
        url(r'^assets/delete$', views.asset_delete, name='combo-manager-asset-delete'),
71 75
        url(r'^assets/overwrite/$', views.asset_overwrite, name='combo-manager-asset-overwrite'),
72 76
        url(r'^assets/upload/$', views.asset_upload, name='combo-manager-asset-upload'),
73
        url(r'^ckeditor/', include('ckeditor.urls')),
77
         url(r'^ckeditor/upload/', staff_member_required(ckeditor_views.upload),
78
             name='ckeditor_upload'),
79
         url(r'^ckeditor/browse/', never_cache(staff_member_required(ckeditor_views.browse)),
80
             name='ckeditor_browse'),
74 81
]
75 82

  
76 83
urlpatterns = plugins.register_plugins_manager_urls(urlpatterns)
77
-