entrouvert
/
combo
16
1
Fork 0
Code Issues Pull Requests 10 Releases Wiki Activity

misc: adapt ckeditor inclusion for django 1.11 (#20917)

This commit is contained in:
Frédéric Péters 2017-09-09 13:47:23 +02:00
parent 0aee0ea7ed
commit cedf6067a0
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
combo/manager/urls.py
View File

@ -15,6 +15,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
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)