# HG changeset patch # User cavaliet # Date 1369140881 -7200 # Node ID 64a77e529f23d57839c325e97df15481c6ab9b21 # Parent 6a3d8d05e3fb153189d0648cf79d717bf5716617 first image model and upload form. diff -r 6a3d8d05e3fb -r 64a77e529f23 src/metadatacomposer/forms.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/metadatacomposer/forms.py Tue May 21 14:54:41 2013 +0200 @@ -0,0 +1,9 @@ +# forms.py +from django import forms +from metadatacomposer.models import Image + +class ImageUploadModelForm(forms.ModelForm): + + class Meta: + model = Image + fields = ['image_file', 'title', 'description'] \ No newline at end of file diff -r 6a3d8d05e3fb -r 64a77e529f23 src/metadatacomposer/migrations/0001_initial.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/metadatacomposer/migrations/0001_initial.py Tue May 21 14:54:41 2013 +0200 @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'Image' + db.create_table('metadatacomposer_image', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('image_file', self.gf('django.db.models.fields.files.ImageField')(max_length=2048)), + ('width', self.gf('django.db.models.fields.IntegerField')()), + ('height', self.gf('django.db.models.fields.IntegerField')()), + ('title', self.gf('django.db.models.fields.CharField')(max_length=1024, null=True, blank=True)), + ('description', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), + ('creation_date', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + ('modification_date', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)), + )) + db.send_create_signal('metadatacomposer', ['Image']) + + + def backwards(self, orm): + # Deleting model 'Image' + db.delete_table('metadatacomposer_image') + + + models = { + 'metadatacomposer.image': { + 'Meta': {'object_name': 'Image'}, + 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'height': ('django.db.models.fields.IntegerField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image_file': ('django.db.models.fields.files.ImageField', [], {'max_length': '2048'}), + 'modification_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), + 'width': ('django.db.models.fields.IntegerField', [], {}) + } + } + + complete_apps = ['metadatacomposer'] \ No newline at end of file diff -r 6a3d8d05e3fb -r 64a77e529f23 src/metadatacomposer/migrations/__init__.py diff -r 6a3d8d05e3fb -r 64a77e529f23 src/metadatacomposer/models.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/metadatacomposer/models.py Tue May 21 14:54:41 2013 +0200 @@ -0,0 +1,24 @@ +from django.db import models +import os +import time + + +def image_file_name(instance, filename): + now = time.time() + milliseconds = '%03d' % int((now - int(now)) * 1000) + localtime = time.localtime() + _, ext = os.path.splitext(filename) + filename = time.strftime('%Y%m%d%H%M%S', localtime) + milliseconds + return 'metadatacomposer/images/' + filename + ext + + +class Image(models.Model): + + image_file = models.ImageField(width_field="width", height_field="height", upload_to=image_file_name, max_length=2048) + width = models.IntegerField(null=False, blank=False) + height = models.IntegerField(null=False, blank=False) + title = models.CharField(null=True, blank=True, max_length=1024) + description = models.TextField(null=True, blank=True) + creation_date = models.DateTimeField(auto_now_add=True) + modification_date = models.DateTimeField(auto_now=True) + \ No newline at end of file diff -r 6a3d8d05e3fb -r 64a77e529f23 src/metadatacomposer/templates/metadatacomposer_home.html --- a/src/metadatacomposer/templates/metadatacomposer_home.html Thu May 16 18:11:00 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_home.html Tue May 21 14:54:41 2013 +0200 @@ -46,7 +46,7 @@
-

Derniers projets

+

Derniers projets

Ajouter un projet
@@ -64,30 +64,12 @@
Ajouter une image
-
- -

Titre de l'image

-
+ {% for i in images %}
- -

Titre de l'image

-
-
- -

Titre de l'image

+ {% thumbnail i.image_file "140x140" crop="center" format="PNG" as im %}{% empty %}{% endthumbnail %} +

{{ i.title }}
-
- -

Titre de l'image

-
-
- -

Titre de l'image

-
-
- -

Titre de l'image

-
+ {% endfor %}
diff -r 6a3d8d05e3fb -r 64a77e529f23 src/metadatacomposer/templates/metadatacomposer_modal_image.html --- a/src/metadatacomposer/templates/metadatacomposer_modal_image.html Thu May 16 18:11:00 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_modal_image.html Tue May 21 14:54:41 2013 +0200 @@ -1,4 +1,4 @@ -{% load static %} +{% load static %}
    @@ -8,20 +8,23 @@

Informations et source de l'image

-
+ {% csrf_token %} + {% for error in form.errors.name %} + {{ error }} + {% endfor %}
- +
- +
-
+
- + Prévisualiser
diff -r 6a3d8d05e3fb -r 64a77e529f23 src/metadatacomposer/views.py --- a/src/metadatacomposer/views.py Thu May 16 18:11:00 2013 +0200 +++ b/src/metadatacomposer/views.py Tue May 21 14:54:41 2013 +0200 @@ -1,13 +1,13 @@ from django.conf import settings -from django.contrib.auth.models import User from django.contrib.auth.decorators import login_required -from django.core.exceptions import ObjectDoesNotExist from django.core.paginator import Paginator, InvalidPage, EmptyPage -from django.http import HttpResponseNotFound, HttpResponse from django.shortcuts import redirect from django.utils.decorators import method_decorator from django.views.generic.base import View, TemplateResponseMixin +from django.views.generic.edit import FormView from ldt.ldt_utils.models import Project, Content +from metadatacomposer.forms import ImageUploadModelForm +from metadatacomposer.models import Image import logging #@UnresolvedImport @@ -39,10 +39,12 @@ self.branding = branding 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) - context.update({"projects":projects, "contents": contents}) + context.update({"projects":projects, "images": images, "contents": contents}) return self.render_to_response(context) @@ -173,6 +175,33 @@ def get(self, request, branding="iri", **kwargs): self.branding = branding + + # Add form + form = ImageUploadModelForm() + context = self.get_context_dict(request) + context.update({"form":form}) return self.render_to_response(context) - \ No newline at end of file + + 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 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() + else: + logger.debug("COUCOU 3") + context = self.get_context_dict(request) + context.update({"form":form}) + return redirect(request.META['HTTP_REFERER']) + + +