Merge pull request #25 from scream4ik/master

django 1.8+ compatibility
miguelramos · Oct 18, 2016 · 8cbbfaf · 8cbbfaf
2 parents 66e3e22 + 96055bc
commit 8cbbfaf
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ At the moment i'm without time to maintain this great project. To all the people
 	or
 	pip install https://github.com/miguelramos/django-media-manager/archive/master.zip
 
-*	Add filebrowser to INSTALLED_APPS.
+*	Add filebrowser to INSTALLED_APPS before django.contrib.admin.
 *	Add the following line _before_ the admin URLS:
 *		(r'^admin/filebrowser/', include('filebrowser.urls'))
 *	Collect static files

diff --git a/filebrowser/fields.py b/filebrowser/fields.py
@@ -29,10 +29,10 @@ def _template():
 
 class FileBrowseWidget(Input):
     input_type = 'text'
-    
+
     class Media:
-        js = (os.path.join(URL_FILEBROWSER_MEDIA, 'js/AddFileBrowser.js'), )
-    
+        js = (os.path.join(URL_FILEBROWSER_MEDIA, 'js/AddFileBrowser.js'),)
+
     def __init__(self, attrs=None):
         self.directory = attrs.get('directory', '')
         self.extensions = attrs.get('extensions', '')
@@ -41,32 +41,35 @@ def __init__(self, attrs=None):
             self.attrs = attrs.copy()
         else:
             self.attrs = {}
-    
+
     def render(self, name, value, attrs=None):
         if value is None:
             value = ""
         final_attrs = self.build_attrs(attrs, type=self.input_type, name=name)
-        final_attrs['search_icon'] = URL_FILEBROWSER_MEDIA + 'img/filebrowser_icon_show.gif'
+        final_attrs[
+            'search_icon'] = URL_FILEBROWSER_MEDIA + 'img/filebrowser_icon_show.gif'
         final_attrs['directory'] = self.directory
         final_attrs['extensions'] = self.extensions
         final_attrs['format'] = self.format
         final_attrs['ADMIN_THUMBNAIL'] = ADMIN_THUMBNAIL
         final_attrs['DEBUG'] = DEBUG
         if value != "":
             try:
-                final_attrs['directory'] = os.path.split(value.path_relative_directory)[0]
+                final_attrs['directory'] = \
+                os.path.split(value.path_relative_directory)[0]
             except:
                 pass
         return render_to_string(_template() + "custom_field.html", locals())
 
 
 class FileBrowseFormField(forms.CharField):
     widget = FileBrowseWidget
-    
+
     default_error_messages = {
-        'extension': _(u'Extension %(ext)s is not allowed. Only %(allowed)s is allowed.'),
+        'extension': _(
+            u'Extension %(ext)s is not allowed. Only %(allowed)s is allowed.'),
     }
-    
+
     def __init__(self, max_length=None, min_length=None,
                  directory=None, extensions=None, format=None,
                  *args, **kwargs):
@@ -77,42 +80,48 @@ def __init__(self, max_length=None, min_length=None,
             self.format = format or ''
             self.extensions = extensions or EXTENSIONS.get(format)
         super(FileBrowseFormField, self).__init__(*args, **kwargs)
-    
+
     def clean(self, value):
         value = super(FileBrowseFormField, self).clean(value)
         if value == '':
             return value
         file_extension = os.path.splitext(value)[1].lower()
         if self.extensions and not file_extension in self.extensions:
-            raise forms.ValidationError(self.error_messages['extension'] % {'ext': file_extension, 'allowed': ", ".join(self.extensions)})
+            raise forms.ValidationError(
+                self.error_messages['extension'] % {'ext': file_extension,
+                                                    'allowed': ", ".join(
+                                                        self.extensions)})
         return value
 
 
 class FileBrowseField(Field):
-    __metaclass__ = models.SubfieldBase
-
     def __init__(self, *args, **kwargs):
         self.directory = kwargs.pop('directory', '')
         self.extensions = kwargs.pop('extensions', '')
         self.format = kwargs.pop('format', '')
         super(FileBrowseField, self).__init__(*args, **kwargs)
-
+
+    def from_db_value(self, value, expression, connection, context):
+        if not value or isinstance(value, FileObject):
+            return value
+        return FileObject(url_to_path(value))
+
     def to_python(self, value):
         if not value or isinstance(value, FileObject):
             return value
         return FileObject(url_to_path(value))
-    
+
     def get_db_prep_value(self, value, connection, prepared=False):
         if value is None:
             return None
         return str(value)
 
     def get_manipulator_field_objs(self):
         return [oldforms.TextField]
-    
+
     def get_internal_type(self):
         return "CharField"
-    
+
     def formfield(self, **kwargs):
         attrs = {}
         attrs["directory"] = self.directory
@@ -128,8 +137,10 @@ def formfield(self, **kwargs):
         defaults.update(kwargs)
         return super(FileBrowseField, self).formfield(**defaults)
 
+
 try:
     from south.modelsinspector import add_introspection_rules
+
     add_introspection_rules([], ["^filebrowser\.fields\.FileBrowseField"])
 except:
     pass
diff --git a/filebrowser/static/admin/inlines.js → filebrowser/static/admin/js/inlines.js b/filebrowser/static/admin/inlines.js → filebrowser/static/admin/js/inlines.js
diff --git a/filebrowser/templates/suit/index.html b/filebrowser/templates/suit/index.html
@@ -1,7 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_static admin_list admin_urls %}
 {% load fb_tags fb_pagination %}
-{% load url from future %}
 
 {% block extrastyle %}
     {{ block.super }}
@@ -178,4 +177,4 @@ <h4>{% trans 'Nothing found' %}!</h4>
             </div>
         </div>
     </div>
-{% endblock %}
+{% endblock %}
diff --git a/filebrowser/templates/suit/makedir.html b/filebrowser/templates/suit/makedir.html
@@ -1,7 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_static admin_list admin_urls %}
 {% load fb_tags fb_csrf %}
-{% load url from future %}
 
 {% block extrastyle %}
     {{ block.super }}
@@ -49,4 +48,4 @@
             </div>
         </form>
     </div>
-{% endblock %}
+{% endblock %}
diff --git a/filebrowser/templates/suit/rename.html b/filebrowser/templates/suit/rename.html
@@ -1,7 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_static admin_list admin_urls %}
 {% load fb_tags fb_csrf %}
-{% load url from future %}
 
 {% block extrastyle %}
     {{ block.super }}
@@ -53,4 +52,4 @@
             </div>
         </form>
     </div>
-{% endblock %}
+{% endblock %}
diff --git a/filebrowser/templates/suit/upload.html b/filebrowser/templates/suit/upload.html
@@ -1,7 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_static admin_list admin_urls %}
 {% load fb_tags %}
-{% load url from future %}
 
 {% block extrastyle %}
     {{ block.super }}
@@ -119,4 +118,4 @@
             </div>
         </form>
     </div>
-{% endblock %}
+{% endblock %}