Dernières images

+ +

{% for i in images %} @@ -91,6 +95,13 @@

+ {% endblock %} {% block modal_divs %} {% endblock %} diff -r ab966883a458 -r ff669687a0d2 src/metadatacomposer/templates/metadatacomposer_modal_image.html --- a/src/metadatacomposer/templates/metadatacomposer_modal_image.html Tue May 21 17:41:57 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_modal_image.html Tue May 21 18:01:07 2013 +0200 @@ -1,4 +1,5 @@ -{% load static %} +{% load static %} +{% load thumbnail %}

Informations et source de l'image

{% csrf_token %} - {% for error in form.errors.name %} + {% if image_pk %}{% endif %} + {% for error in form.errors %} {{ error }} {% endfor %}

Titre :

- +

Description :

- +

+ + {{ res.modification_date|date:"Y/m/d" }} + + + + + + + + {% endfor %} + + +

{% trans "Previous" %}
{% trans "Previous" %}
{{i|add:'1'}}
{{i|add:'1'}}
{% trans "Next" %}
{% trans "Next" %}
({% trans "All" %})

\ No newline at end of file diff -r ab966883a458 -r ff669687a0d2 src/metadatacomposer/urls.py --- a/src/metadatacomposer/urls.py Tue May 21 17:41:57 2013 +0200 +++ b/src/metadatacomposer/urls.py Tue May 21 18:01:07 2013 +0200 @@ -1,12 +1,14 @@ from django.conf.urls.defaults import patterns, url from metadatacomposer.views import MetadataComposerHome, MetadataComposerProjectList,\ MetadataComposerResourceList, MetadataComposerContentPagination,\ - MetadataComposerModalVideo, MetadataComposerModalImage + MetadataComposerModalVideo, MetadataComposerModalImage,\ + MetadataComposerImagePagination urlpatterns = patterns('', url(r'^jsi18n/(?P\S+?)/$', 'django.views.i18n.javascript_catalog', name='jsi18n'), url(r'^(?P.*)/projectlist/$', MetadataComposerProjectList.as_view(), name="composer_project_list"), url(r'^(?P.*)/resourcelist/$', MetadataComposerResourceList.as_view(), name="composer_resource_list"), + url(r'^(?P.*)/imagepage/$', MetadataComposerImagePagination.as_view(), name="composer_image_page"), url(r'^(?P.*)/contentpage/$', MetadataComposerContentPagination.as_view(), name="composer_content_page"), url(r'^(?P.*)/modalvideo/$', MetadataComposerModalVideo.as_view(), name="composer_modal_video"), url(r'^(?P.*)/modalimage/$', MetadataComposerModalImage.as_view(), name="composer_modal_image"), diff -r ab966883a458 -r ff669687a0d2 src/metadatacomposer/views.py --- a/src/metadatacomposer/views.py Tue May 21 17:41:57 2013 +0200 +++ b/src/metadatacomposer/views.py Tue May 21 18:01:07 2013 +0200 @@ -40,7 +40,6 @@ projects = Project.safe_objects.filter(owner=request.user).order_by('-modification_date')[:6] images = Image.objects.order_by('-modification_date')[:6] - logger.debug(images) contents = Content.safe_objects.order_by('-update_date')[:6] context = self.get_context_dict(request) @@ -91,12 +90,34 @@ def get(self, request, branding="iri", **kwargs): self.branding = branding + # We get the first page of images + image_results = get_images(1) # We get the first contents page and theirs projects content_results = get_contents_and_projects(1, request.user) - # We get the first page of images context = self.get_context_dict(request) - context.update({"content_results":content_results}) + context.update({"image_results":image_results, "content_results":content_results}) + return self.render_to_response(context) + + + +class MetadataComposerImagePagination(TemplateResponseMixin, MetadataComposerContextView): + + def get_template_names(self): + return "partial/resource_image_list.html" + + @method_decorator(login_required) + def dispatch(self, *args, **kwargs): + return super(MetadataComposerImagePagination, self).dispatch(*args, **kwargs) + + def get(self, request, branding="iri", **kwargs): + self.branding = branding + page = request.GET.get("page") or 1 + # Get current contents page and theirs projects + image_results = get_images(page) + + context = self.get_context_dict(request) + context.update({"image_results":image_results}) return self.render_to_response(context) @@ -122,6 +143,24 @@ +def get_images(page): + + # We get the current's page images + images = Image.objects.order_by('-modification_date') + #nb = getattr(settings, 'METADATACOMPOSER_ELEMENTS_PER_PAGE', 9) + nb = 2 + if page=="x": + nb = images.count() + paginator = Paginator(images, nb) + try: + results = paginator.page(page) + except (EmptyPage, InvalidPage): + results = paginator.page(paginator.num_pages) + + return results + + + def get_contents_and_projects(page, user): # We get the current's page contents @@ -175,33 +214,34 @@ def get(self, request, branding="iri", **kwargs): self.branding = branding + image_pk = request.GET.get("image") or None # Add form - form = ImageUploadModelForm() + if image_pk: + form = ImageUploadModelForm(instance=Image.objects.get(pk=image_pk)) + else: + form = ImageUploadModelForm() context = self.get_context_dict(request) - context.update({"form":form}) + context.update({"form":form, "image_pk":image_pk}) return self.render_to_response(context) def post(self, request, branding="iri", **kwargs): self.branding = branding # Check form - form = ImageUploadModelForm(request.POST, request.FILES) - logger.debug("COUCOU 1") - logger.debug(form) - logger.debug(form.is_valid()) + if 'image_pk' in request.POST: + form = ImageUploadModelForm(request.POST, request.FILES, instance=Image.objects.get(pk=request.POST['image_pk'])) + else: + form = ImageUploadModelForm(request.POST, request.FILES) if form.is_valid(): - logger.debug("COUCOU 2") # If an image id was in the form, we update the existing image - if 'image_pk' in request.POST: - form = ImageUploadModelForm(request.POST, request.FILES, instance=Image.objects.get(pk=request.POST['image_pk'])) form.save() + return redirect(request.META['HTTP_REFERER']) else: - logger.debug("COUCOU 3") context = self.get_context_dict(request) context.update({"form":form}) - return redirect(request.META['HTTP_REFERER']) + return redirect("composer_modal_image", branding=branding)