From 253a9d7af64d16a0a6ce092ea88b35f9cea5cf1a Mon Sep 17 00:00:00 2001 From: Simon Fransson Date: Fri, 17 Oct 2014 00:06:25 +0200 Subject: [PATCH 1/2] Made get_image_files() exclude hidden files (leading . in filename). --- ckeditor/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ckeditor/views.py b/ckeditor/views.py index 336001b..3223581 100644 --- a/ckeditor/views.py +++ b/ckeditor/views.py @@ -98,7 +98,7 @@ def get_image_files(user=None, path=''): return for filename in storage_list[STORAGE_FILES]: - if os.path.splitext(filename)[0].endswith('_thumb'): + if os.path.splitext(filename)[0].endswith('_thumb') or os.path.basename(filename).startswith('.'): continue filename = os.path.join(browse_path, filename) yield filename From 0526219288a243b044584415157c740d4d66e487 Mon Sep 17 00:00:00 2001 From: Simon Fransson Date: Fri, 17 Oct 2014 00:08:16 +0200 Subject: [PATCH 2/2] Added never_cache() decorator to browse view, as the it often did not display newly uploaded files after being loaded once. --- ckeditor/urls.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ckeditor/urls.py b/ckeditor/urls.py index a88bb0d..e8a3d70 100644 --- a/ckeditor/urls.py +++ b/ckeditor/urls.py @@ -1,10 +1,11 @@ from django.conf.urls import patterns, url from django.contrib.admin.views.decorators import staff_member_required +from django.views.decorators.cache import never_cache from ckeditor import views urlpatterns = patterns( '', url(r'^upload/', staff_member_required(views.upload), name='ckeditor_upload'), - url(r'^browse/', staff_member_required(views.browse), name='ckeditor_browse'), + url(r'^browse/', never_cache(staff_member_required(views.browse)), name='ckeditor_browse'), )