diff --git a/filer/__init__.py b/filer/__init__.py index 2aa160e23..045feda8d 100644 --- a/filer/__init__.py +++ b/filer/__init__.py @@ -1,6 +1,6 @@ """ django-filer - file and image management for django projects """ -VERSION = (0,6,2,'a7') -__version__ = "0.6.2a7" +VERSION = (0,6,2,'a8') +__version__ = "0.6.2a8" __authors__ = ["Stefan Foulis ", ] \ No newline at end of file diff --git a/filer/models/filemodels.py b/filer/models/filemodels.py index 679637d71..ddf8c38a1 100644 --- a/filer/models/filemodels.py +++ b/filer/models/filemodels.py @@ -110,7 +110,11 @@ def subtype(self): return r def get_admin_url_path(self): return urlresolvers.reverse('admin:filer_file_change', args=(self.id,)) - def url(self): + @property + def url(self): + ''' + to make the model behave like a file field + ''' try: r = self._file.url except: diff --git a/filer/models/imagemodels.py b/filer/models/imagemodels.py index 9f8178983..8eff3e6c5 100644 --- a/filer/models/imagemodels.py +++ b/filer/models/imagemodels.py @@ -191,12 +191,6 @@ def thumbnails(self): return self._thumbnails @property - def url(self): - ''' - needed to make this behave like a ImageField - ''' - return self._file.url - @property def absolute_image_url(self): return self.url @property diff --git a/filer/templates/admin/filer/tools/clipboard/clipboard.html b/filer/templates/admin/filer/tools/clipboard/clipboard.html index 6ff451c07..b08f5223a 100644 --- a/filer/templates/admin/filer/tools/clipboard/clipboard.html +++ b/filer/templates/admin/filer/tools/clipboard/clipboard.html @@ -19,13 +19,13 @@ {% if is_popup %}{% endif %} - + {% comment %}
{% if is_popup %}{% endif %} -
+ {% endcomment %}