+ {% if current_user_collection_list %}
+ {% endif %}
+ {% block popins %}{% endblock %}
- {% endif %}
- {% block popins %}{% endblock %}
egonomy
diff -r 61ff8ecfdb28 -r c90576d18319 src/egonomy/templates/egonomy_view_collection.html --- a/src/egonomy/templates/egonomy_view_collection.html Thu Jun 27 12:28:09 2013 +0200 +++ b/src/egonomy/templates/egonomy_view_collection.html Thu Jun 27 12:51:32 2013 +0200 @@ -6,7 +6,6 @@ {% block title %}{% trans "View a fragment" %}{% endblock %} {% block popins %} -PARAMÈTRES DE LA COLLECTION
@@ -58,16 +57,16 @@-
-
- 
+ 
+
Collection n°1
par Hubert Trucchose
-
-
+
+
-
+ {% if items %}
+ {% ifequal display "slideshow" %}
+ {{ col.title }}
+{{ col.title }} / par {{ col.author }}
-
+ {% for item in items %}
+ {% ifequal item.content_type.model "fragment" %}
+
-
+ {% with fragment=item.content_object %}
+
+ ++ {% endwith %} ++ {% if col.author == user %}+
{% endif %}
+ {{ fragment.title }}
+{{ fragment.author }}
+desc : {{ item.description }}
+
contenttype : {{ item.content_type.model }}
object_id : {{ item.object_id }}
content_object : {{ item.content_object }}
+ {% else %}
+ {% with img=item.content_object %}
+ {% with img.info.image_file as image %}
+ {% if image %}
+ {% if image|is_portrait %}
+ -
+ + + {% thumbnail image "225" format="PNG" crop="center" as im %} +\ No newline at end of file diff -r 61ff8ecfdb28 -r c90576d18319 src/egonomy/urls.py --- a/src/egonomy/urls.py Thu Jun 27 12:28:09 2013 +0200 +++ b/src/egonomy/urls.py Thu Jun 27 12:51:32 2013 +0200 @@ -23,6 +23,7 @@ url(r'^usercollections/(?P
+ {% empty %} +
+ {% endthumbnail %}
+
+ {% else %}
+ - +
+ {% else %} ++ + {% thumbnail image "469" format="PNG" crop="center" as im %} ++
+ {% endthumbnail %}
+
+ {% endif %}
+
+ +++ {% if col.author == user %}+{% endif %}
+ {{ img.metadata.titre }}
+{{ img.metadata.auteur }}
+desc : {{ item.description }}
+
contenttype : {{ item.content_type.model }}
object_id : {{ item.object_id }}
content_object : {{ item.content_object }}
+ {% endif %}
+ {% endwith %}
+ {% endwith %}
+ {% endifequal %}
+ {% endfor %}
+
+ {% endifequal %}
+ {% else %}
+ {% endif %} {% endblock %} {% block js_page %} diff -r 61ff8ecfdb28 -r c90576d18319 src/egonomy/templates/egonomy_view_fragment.html --- a/src/egonomy/templates/egonomy_view_fragment.html Thu Jun 27 12:28:09 2013 +0200 +++ b/src/egonomy/templates/egonomy_view_fragment.html Thu Jun 27 12:51:32 2013 +0200 @@ -31,7 +31,7 @@- {% if user.is_authenticated %} - {% trans "Add to a collection" %} + {% trans "Add to a collection" %} {% else %} {% trans "Add to a collection" %} {% endif %} @@ -40,9 +40,6 @@ Enregistrer sous
- - Ajouter à ma collection -
-.*)/$', 'egonomy.views.user_collections', name='user_collections'), url(r'^newcollection/$', 'egonomy.views.new_collection', name='new_collection'), url(r'^viewcollection/(?P .*)/$', 'egonomy.views.view_collection', name='view_collection'), + url(r'^additem/$', 'egonomy.views.add_item_to_collection', name='add_item'), # Uncomment the admin/doc line below to enable admin documentation: url(r'^admin/doc/', include('django.contrib.admindocs.urls')), diff -r 61ff8ecfdb28 -r c90576d18319 src/egonomy/views.py --- a/src/egonomy/views.py Thu Jun 27 12:28:09 2013 +0200 +++ b/src/egonomy/views.py Thu Jun 27 12:51:32 2013 +0200 @@ -1,6 +1,7 @@ from django.conf import settings from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User +from django.contrib.contenttypes.models import ContentType from django.core.paginator import Paginator, InvalidPage, EmptyPage from django.core.urlresolvers import reverse from django.db.models.aggregates import Max @@ -8,7 +9,8 @@ from django.shortcuts import get_object_or_404, render_to_response, redirect from django.template import RequestContext from django.utils.translation import ugettext as _ -from egonomy.models import ImageMetadata, Image, Fragment, ImageInfo, Collection +from egonomy.models import ImageMetadata, Image, Fragment, ImageInfo, Collection,\ + CollectionItem from egonomy.search_indexes import QueryParser from egonomy.search_indexes.paginator import SearchPaginator from egonomy.search_indexes.query import ModelRelatedSearchQuerySet @@ -371,7 +373,7 @@ cur_page_nb = request.GET.get("page") or 1 cur_page_nb = int(cur_page_nb) - collections = Collection.objects.filter(public=True).order_by('-creation').select_related('items') + collections = Collection.objects.filter(public=True).order_by('-creation').select_related('author', 'items') nb = request.GET.get("limit") or getattr(settings,"IMAGES_PER_PAGE", 32) paginator = Paginator(collections, nb) @@ -398,10 +400,10 @@ if user==request.user: user_collections = True - collections = Collection.objects.filter(author=user).order_by('-creation').select_related('items') + collections = Collection.objects.filter(author=user).order_by('-creation').select_related('author', 'items') else: user_collections = False - collections = Collection.objects.filter(author=user).filter(public=True).order_by('-creation').select_related('items') + collections = Collection.objects.filter(author=user).filter(public=True).order_by('-creation').select_related('author', 'items') nb = request.GET.get("limit") or getattr(settings,"IMAGES_PER_PAGE", 32) paginator = Paginator(collections, nb) @@ -438,10 +440,16 @@ def view_collection(request, collection_pk): - col = get_object_or_404(Collection.objects.select_related('items'), pk=collection_pk) + display = request.GET.get("display") or "slideshow" + if display!="slideshow" and display!="mosaic" and display!="geographical": + display = "slideshow" + + col = get_object_or_404(Collection.objects.select_related('author'), pk=collection_pk) + items = CollectionItem.objects.filter(collection=col).select_related('author', 'content_type', 'object_id', 'content_object').order_by("order") return render_to_response("egonomy_view_collection.html", - {'col':col}, + {'col':col, 'items':items, 'display':display, + 'current_user_collection_list':current_user_collection_list(request)}, context_instance=RequestContext(request)) @@ -454,3 +462,48 @@ else: return None + + + +def add_item_to_collection(request): + + col_pk = request.POST["collection-pk"] + item_desc = request.POST["item-description"] + item_type = request.POST["item-type"] + item_id = request.POST["item-id"] + + # Test collection + try: + col_pk = int(col_pk) + except: + return HttpResponse("Collection number invalid.", status_code=400) + col = get_object_or_404(Collection, pk=col_pk) + + if item_type=="image": + # Test image + item = get_object_or_404(Image, id=item_id) + elif item_type=="fragment": + # Test fragment + try: + item_id = int(item_id) + except: + return HttpResponse("Fragment number invalid.", status_code=400) + item = get_object_or_404(Fragment, pk=item_id) + else: + return HttpResponse("item-type must be 'image' or 'fragment'.", status_code=400) + + col_item = CollectionItem() + col_item.collection = col + col_item.content_type = ContentType.objects.get_for_model(item) + col_item.object_id = str(item_id) + col_item.content_object = item + col_item.description = item_desc + # Get the collection's max order and set the new item's one + max_order = CollectionItem.objects.filter(collection=col).aggregate(Max('order'))['order__max'] + if not max_order: + max_order = 0 + col_item.order = max_order + 1 + col_item.save() + + return redirect("view_collection", collection_pk=col.pk) + - +