# HG changeset patch
# User cavaliet
# Date 1396430823 -7200
# Node ID 447cfde9ebbd3b147e311aadbe9611f27b3242d2
# Parent  36c7f7ff3ffb5368e92f488a188734688c193250
v0.9.4 : manage image error during import.

diff -r 36c7f7ff3ffb -r 447cfde9ebbd src/egonomy/__init__.py
--- a/src/egonomy/__init__.py	Wed Apr 02 02:16:17 2014 +0200
+++ b/src/egonomy/__init__.py	Wed Apr 02 11:27:03 2014 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 9, 3, "final", 0)
+VERSION = (0, 9, 4, "final", 0)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
 
diff -r 36c7f7ff3ffb -r 447cfde9ebbd src/egonomy/templates/egonomy_view_collection.html
--- a/src/egonomy/templates/egonomy_view_collection.html	Wed Apr 02 02:16:17 2014 +0200
+++ b/src/egonomy/templates/egonomy_view_collection.html	Wed Apr 02 11:27:03 2014 +0200
@@ -132,6 +132,7 @@
                     <li><a href="#">envoyer vers collage</a></li-->
                 </ul>
             </div>
+            {% if ignored_images %}<p>Information : certaines images n'ont pas pu être importées car elles n'ont pas été trouvées dans la base de données.</p>{% endif %}
             <div class="bar-tools clearfix">
                 <ul class="clearfix">
                   {% ifequal display "mosaic" %}
diff -r 36c7f7ff3ffb -r 447cfde9ebbd src/egonomy/urls.py
--- a/src/egonomy/urls.py	Wed Apr 02 02:16:17 2014 +0200
+++ b/src/egonomy/urls.py	Wed Apr 02 11:27:03 2014 +0200
@@ -24,6 +24,7 @@
     url(r'^savecollection/$', 'egonomy.views.save_collection', name='save_collection'),
     url(r'^deletecollection/$', 'egonomy.views.delete_collection', name='delete_collection'),
     url(r'^viewcollection/(?P<collection_pk>.*)/$', 'egonomy.views.view_collection', name='view_collection'),
+    url(r'^viewcollection/(?P<collection_pk>.*)/(?P<ignored_images>.*)$', 'egonomy.views.view_collection', name='view_collection'),
     url(r'^additem/$', 'egonomy.views.add_item_to_collection', name='add_item'),
     url(r'^removeitem/$', 'egonomy.views.remove_item_from_collection', name='remove_item'),
     url(r'^modifyitem/$', 'egonomy.views.modify_item_in_collection', name='modify_item'),
diff -r 36c7f7ff3ffb -r 447cfde9ebbd src/egonomy/views.py
--- a/src/egonomy/views.py	Wed Apr 02 02:16:17 2014 +0200
+++ b/src/egonomy/views.py	Wed Apr 02 11:27:03 2014 +0200
@@ -574,7 +574,7 @@
 
 
 
-def view_collection(request, collection_pk):
+def view_collection(request, collection_pk, ignored_images=False):
     
     display = request.GET.get("display") or "list"
     if display!="list" and display!="mosaic" and display!="slideshow" and display!="geographical":
@@ -602,7 +602,7 @@
     
     return render_to_response("egonomy_view_collection.html",
                               {'col':col, 'items':items, 'display':display, 'places':json.dumps(places),
-                               'current_user_collection_list':current_user_collection_list(request)},
+                               'current_user_collection_list':current_user_collection_list(request), 'ignored_images':ignored_images},
                               context_instance=RequestContext(request))
 
 
@@ -844,8 +844,13 @@
     col.public = True
     col.save()
     order = 1
+    ignored_images = False
     for i in img_ids:
-        item = get_object_or_404(Image, id=i)
+        try:
+            item = Image.objects.get(id=i)
+        except:
+            ignored_images = True
+            continue
         col_item = CollectionItem()
         col_item.collection = col
         col_item.content_type = img_content_type
@@ -856,8 +861,7 @@
         order += 1
         col_item.save()
     
-    return redirect("view_collection", collection_pk=col.pk)
-    #return HttpResponse("hello image list = " + str(img_ids))
+    return redirect("view_collection", collection_pk=col.pk, ignored_images=ignored_images)