{% with img.info.image_file as image %}
{% if image %}
diff -r 35aca8206b40 -r 2cca82dd0e79 src/egonomy/urls.py
--- a/src/egonomy/urls.py Mon Jul 01 17:38:34 2013 +0200
+++ b/src/egonomy/urls.py Tue Jul 02 13:16:00 2013 +0200
@@ -26,6 +26,7 @@
url(r'^viewcollection/(?P.*)/$', 'egonomy.views.view_collection', name='view_collection'),
url(r'^additem/$', 'egonomy.views.add_item_to_collection', name='add_item'),
url(r'^embedslideshow/(?P.*)/$', 'egonomy.views.embed_slideshow', name='embed_slideshow'),
+ url(r'^picturebysearch/$', 'egonomy.views.picture_by_search', name='picture_by_search'),
# Uncomment the admin/doc line below to enable admin documentation:
url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
diff -r 35aca8206b40 -r 2cca82dd0e79 src/egonomy/views.py
--- a/src/egonomy/views.py Mon Jul 01 17:38:34 2013 +0200
+++ b/src/egonomy/views.py Tue Jul 02 13:16:00 2013 +0200
@@ -52,8 +52,13 @@
if len(frg_list)>0:
last_frg = frg_list[0]
+ # If we display the picture after a search, we propose the previous and next picture
+ search = request.GET.get("search") or None
+ index_search = request.GET.get("index_search") or None
+
return render_to_response("egonomy_annotate_picture.html",
{'img': img, 'fragment_list': frg_list, 'last_frg':last_frg,
+ 'search': search, 'index_search': index_search,
'current_user_collection_list':current_user_collection_list(request)},
context_instance=RequestContext(request))
@@ -153,15 +158,47 @@
results = paginator.page(paginator.num_pages)
url_pagination = reverse("all_pictures") + "?limit=" + str(nb)
+ offset_search = None
if search:
url_pagination = url_pagination + "&search=" + search
+ offset_search = int(nb) * (cur_page_nb-1)
return render_to_response("egonomy_all_pictures.html",
- {'results':results, 'nb_pages':paginator.num_pages, 'cur_page_nb':cur_page_nb, "search":search, "nb_results":nb_results, "url_pagination":url_pagination,
+ {'results':results, 'nb_pages':paginator.num_pages, 'cur_page_nb':cur_page_nb, "search":search, "nb_results":nb_results,
+ "url_pagination":url_pagination, "offset_search":offset_search,
'current_user_collection_list':current_user_collection_list(request)},
context_instance=RequestContext(request))
+def picture_by_search(request):
+
+ # We get the picture in the context of a search
+ index_search = request.GET.get("index_search") or None
+ if not index_search:
+ redirect("home")
+ else:
+ index_search = int(index_search)
+
+ search = None
+ if "search" in request.GET:
+ search = request.GET["search"]
+ field = "all"
+ if "field" in request.GET:
+ field = request.GET["field"]
+
+ img_list = Image.objects.select_related('info', 'metadata')
+ if search:
+ if not field or field == 'all':
+ field = 'text'
+ qp = QueryParser(field)
+ res = ModelRelatedSearchQuerySet(model=Image).filter(qp.parse(search)).models(ImageMetadata).load_all_queryset(Image, img_list).load_all()
+ img = res[index_search]
+ return redirect(reverse("annotate_picture", args=[img.pk]) + "?search=" + search + "&index_search=" + str(index_search))
+ else:
+ redirect("home")
+
+
+
def all_fragments(request):
# Get the cur_page_nb number parameter if possible