Don't rely on the default file storage.

This code was fragile. A HashedFilenameFileStorage for example would have broken it. Rebased by Julian Andrews <jandrews@fusionbox.com>. If something's broken, it's probably his fault!
django-cms · Jan 28, 2016 · d6aca26 · d6aca26
1 parent 933a5b6
commit d6aca26
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/filer/static/filer/js/addons/widget.js b/filer/static/filer/js/addons/widget.js
@@ -11,11 +11,10 @@
         var addImageButton = $(base_id + '_lookup');
         var dropzoneMessage = $(base_id + '_filer_dropzone_message');
         var hiddenClass = 'hidden';
-        var static_prefix = clearer.attr('src').replace('admin/img/icon_deletelink.gif', 'filer/');
 
         clearer.hide();
         hidden_input.removeAttr('value');
-        thumbnail.attr('src', static_prefix + 'icons/nofile_48x48.png');
+        thumbnail.attr('src', clearer.data('no-icon-file'));
         thumbnail.parent('a').removeAttr('href');
         addImageButton.removeClass(hiddenClass);
         dropzoneMessage.removeClass(hiddenClass);

diff --git a/filer/templates/admin/filer/widgets/admin_file.html b/filer/templates/admin/filer/widgets/admin_file.html
@@ -5,7 +5,8 @@
         <span class="filerFile">
             <div class="dz-thumbnail"><img class="quiet" data-dz-thumbnail></div>
             <span data-dz-name class="dz-name"></span>
-            <img class="filerClearer" src="{% static admin_icon_delete %}" width="10" height="10" alt="{% trans 'Clear' %}" title="{% trans 'Clear' %}" data-dz-remove>
+            <img class="filerClearer" src="{% static admin_icon_delete %}" width="10" height="10" alt="{% trans 'Clear' %}" title="{% trans 'Clear' %}"
+                 data-dz-remove data-no-icon-file="{% static 'filer/icon/nofile_48x48.png' %}">
             <div class="dz-progress js-filer-dropzone-progress"><span class="dz-upload" data-dz-uploadprogress></span></div>
         </span>
     </div>
@@ -33,7 +34,8 @@
                 {% trans 'Add File' %}
             </a>
 
-            <img id="{{ clear_id }}" class="filerClearer" src="{% static admin_icon_delete %}" width="10" height="10" alt="{% trans 'Clear' %}" title="{% trans 'Clear' %}"{% if not object %} style="display: none;"{% endif %}>
+            <img id="{{ clear_id }}" class="filerClearer" src="{% static admin_icon_delete %}" width="10" height="10" alt="{% trans 'Clear' %}" title="{% trans 'Clear' %}"
+                 {% if not object %} style="display: none;"{% endif %} data-no-icon-file="{% static 'filer/icons/nofile_48x48.png' %}">
 
             <br>