fix empty item for collection package

diff --git a/telemeta/models/fields.py b/telemeta/models/fields.py
index 9752e2abf35d8efb36f8c509b5e43b352e1d291c..d252b9a23bbdd08449394609d1270ce9f801929b 100644 (file)
--- a/telemeta/models/fields.py
+++ b/telemeta/models/fields.py
@@ -42,7 +42,7 @@ __all__ = ['DurationField', 'Duration', 'WeakForeignKey',
            'DateTimeField', 'FileField', 'ForeignKey', 'FloatField', 'DateField',
            'RequiredFieldError',]
 
-import datetime
+import datetime, re
 from django import forms
 from django.db import models
 from django.utils.translation import ugettext_lazy as _

diff --git a/telemeta/views/collection.py b/telemeta/views/collection.py
index 9bcfb8456809ce09b9e2ac67eeae0d690e44e5dc..a6dca61ea6bb07aaf204ea52e24b9334f71436dc 100644 (file)
--- a/telemeta/views/collection.py
+++ b/telemeta/views/collection.py
@@ -203,8 +203,9 @@ class CollectionPackageView(View):
         z.write(path, arcname=collection.public_id + os.sep + filename)
 
         for item in collection.items.all():
-            filename, ext = os.path.splitext(item.file.path.split(os.sep)[-1])
-            z.write(item.file.path, arcname=collection.public_id + os.sep + item.code + ext)
+            if item.file:
+                filename, ext = os.path.splitext(item.file.path.split(os.sep)[-1])
+                z.write(item.file.path, arcname=collection.public_id + os.sep + item.code + ext)
             marker_view = MarkerView()
             markers = marker_view.get_markers(item.id)
             if markers: