catch a 500 on missing image, removed delete button from clipboard

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 <stefan.foulis@gmail.com>", ]

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:

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

filer/templates/admin/filer/tools/clipboard/clipboard.html

@@ -19,13 +19,13 @@
 					<input type="hidden" name="redirect_to" value="{{ current_url }}" />
 					{% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %}
 					<input type="submit" value="discard" />
-				</form>
+				</form>{% comment %}
 				<form action="{% url admin:filer-delete_clipboard %}" method="post"  style="display: inline;">
 					<input type="hidden" name="clipboard_id" value="{{ clipboard.id }}" />
 					<input type="hidden" name="redirect_to" value="{{ current_url }}" />
 					{% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %}
 					<input type="submit" value="delete files" />
-				</form>
+				</form>{% endcomment %}
 			</td>
 		</tr>
 	</tfoot>