From 243bcec04a632cd2519e92cf2841ce1a4ddbcc75 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 26 Dec 2012 14:25:39 +0530 Subject: [PATCH 1/3] Code now working with an extra field description --- .gitignore | 2 ++ fileupload/models.py | 2 ++ fileupload/static/js/main.js | 11 +++++++++++ fileupload/templatetags/upload_tags.py | 3 ++- fileupload/views.py | 12 +++++++++++- settings.py | 2 +- 6 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 06f5f1d..327912b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /lib /local /share + +*.pyc diff --git a/fileupload/models.py b/fileupload/models.py index 64cf98b..ee1bc41 100644 --- a/fileupload/models.py +++ b/fileupload/models.py @@ -1,5 +1,6 @@ from django.db import models + class Picture(models.Model): # This is a small demo using just two fields. The slug field is really not @@ -9,6 +10,7 @@ class Picture(models.Model): #file = models.FileField(upload_to="pictures") file = models.ImageField(upload_to="pictures") + description = models.CharField(max_length=200, blank=True) slug = models.SlugField(max_length=50, blank=True) def __unicode__(self): diff --git a/fileupload/static/js/main.js b/fileupload/static/js/main.js index 01c86fe..0cca7ac 100644 --- a/fileupload/static/js/main.js +++ b/fileupload/static/js/main.js @@ -28,6 +28,17 @@ $(function () { ) ); + $('#fileupload').bind('fileuploadsubmit', function (e, data) { + var inputs = data.context.find(':input'); + console.log(inputs); + if (inputs.filter('[required][value=""]').first().focus().length) { + return false; + } + data.formData = inputs.serializeArray(); + data.formData.push({"name": 'csrfmiddlewaretoken', 'value': $('input[name=csrfmiddlewaretoken]').val() }); + console.log(data.formData); + }); + if (window.location.hostname === 'blueimp.github.com') { // Demo settings: $('#fileupload').fileupload('option', { diff --git a/fileupload/templatetags/upload_tags.py b/fileupload/templatetags/upload_tags.py index aefce2e..f2af81f 100644 --- a/fileupload/templatetags/upload_tags.py +++ b/fileupload/templatetags/upload_tags.py @@ -11,6 +11,7 @@ def upload_js(): {%=file.name%} + Description: {%=o.formatFileSize(file.size)%} {% if (file.error) { %} {%=locale.fileupload.error%} {%=locale.fileupload.errors[file.error] || file.error%} @@ -53,7 +54,7 @@ def upload_js(): {%=file.name%} {%=o.formatFileSize(file.size)%} - + Description{%=file.description%} {% } %} diff --git a/fileupload/views.py b/fileupload/views.py index 1747056..64226b4 100644 --- a/fileupload/views.py +++ b/fileupload/views.py @@ -5,25 +5,34 @@ from django.utils import simplejson from django.core.urlresolvers import reverse +from django.views.decorators.csrf import csrf_exempt + from django.conf import settings + def response_mimetype(request): if "application/json" in request.META['HTTP_ACCEPT']: return "application/json" else: return "text/plain" + class PictureCreateView(CreateView): model = Picture def form_valid(self, form): self.object = form.save() + print self.object.description f = self.request.FILES.get('file') - data = [{'name': f.name, 'url': settings.MEDIA_URL + "pictures/" + f.name.replace(" ", "_"), 'thumbnail_url': settings.MEDIA_URL + "pictures/" + f.name.replace(" ", "_"), 'delete_url': reverse('upload-delete', args=[self.object.id]), 'delete_type': "DELETE"}] + data = [{'name': f.name, 'url': self.object.file.url, 'description': self.object.description, 'thumbnail_url': self.object.file.url, 'delete_url': reverse('upload-delete', args=[self.object.id]), 'delete_type': "DELETE"}] response = JSONResponse(data, {}, response_mimetype(self.request)) response['Content-Disposition'] = 'inline; filename=files.json' return response + # @csrf_exempt + def dispatch(self, *args, **kwargs): + return super(PictureCreateView, self).dispatch(*args, **kwargs) + class PictureDeleteView(DeleteView): model = Picture @@ -42,6 +51,7 @@ def delete(self, request, *args, **kwargs): else: return HttpResponseRedirect('/upload/new') + class JSONResponse(HttpResponse): """JSON response class.""" def __init__(self,obj='',json_opts={},mimetype="application/json",*args,**kwargs): diff --git a/settings.py b/settings.py index 47396bc..02dd863 100644 --- a/settings.py +++ b/settings.py @@ -95,7 +95,7 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', ) From 8b1d3969641abb48d995e6e060cbb569dcdbde55 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 26 Dec 2012 15:47:21 +0530 Subject: [PATCH 2/3] Fix: serve rezised image for thumbnail images --- fileupload/models.py | 4 ++++ fileupload/templatetags/upload_tags.py | 2 +- fileupload/views.py | 2 +- requirements.txt | 1 + settings.py | 1 + 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fileupload/models.py b/fileupload/models.py index ee1bc41..6a7d476 100644 --- a/fileupload/models.py +++ b/fileupload/models.py @@ -1,4 +1,6 @@ from django.db import models +from imagekit.models import ImageSpecField +from imagekit.processors import ResizeToFill class Picture(models.Model): @@ -10,6 +12,8 @@ class Picture(models.Model): #file = models.FileField(upload_to="pictures") file = models.ImageField(upload_to="pictures") + thumbnail = ImageSpecField([ResizeToFill(50, 50)], image_field='file', + format='JPEG', options={'quality': 90}) description = models.CharField(max_length=200, blank=True) slug = models.SlugField(max_length=50, blank=True) diff --git a/fileupload/templatetags/upload_tags.py b/fileupload/templatetags/upload_tags.py index f2af81f..01a4a0b 100644 --- a/fileupload/templatetags/upload_tags.py +++ b/fileupload/templatetags/upload_tags.py @@ -54,7 +54,7 @@ def upload_js(): {%=file.name%} {%=o.formatFileSize(file.size)%} - Description{%=file.description%} + {%=file.description%} {% } %} diff --git a/fileupload/views.py b/fileupload/views.py index 64226b4..3568859 100644 --- a/fileupload/views.py +++ b/fileupload/views.py @@ -24,7 +24,7 @@ def form_valid(self, form): self.object = form.save() print self.object.description f = self.request.FILES.get('file') - data = [{'name': f.name, 'url': self.object.file.url, 'description': self.object.description, 'thumbnail_url': self.object.file.url, 'delete_url': reverse('upload-delete', args=[self.object.id]), 'delete_type': "DELETE"}] + data = [{'name': f.name, 'url': self.object.file.url, 'description': self.object.description, 'thumbnail_url': self.object.thumbnail.url, 'delete_url': reverse('upload-delete', args=[self.object.id]), 'delete_type': "DELETE"}] response = JSONResponse(data, {}, response_mimetype(self.request)) response['Content-Disposition'] = 'inline; filename=files.json' return response diff --git a/requirements.txt b/requirements.txt index 67a04d6..1c80d55 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ django pillow +django-imagekit diff --git a/settings.py b/settings.py index 02dd863..8c29e66 100644 --- a/settings.py +++ b/settings.py @@ -115,6 +115,7 @@ 'django.contrib.sites', 'django.contrib.messages', 'django.contrib.staticfiles', + 'imagekit', 'fileupload', # Uncomment the next line to enable the admin: # 'django.contrib.admin', From ef36a6df7ec8720811f8e4b57c75d92fe8bd50d8 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 26 Dec 2012 15:53:35 +0530 Subject: [PATCH 3/3] use ResizeToFit instead of ResizeToFill --- fileupload/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fileupload/models.py b/fileupload/models.py index 6a7d476..34f5276 100644 --- a/fileupload/models.py +++ b/fileupload/models.py @@ -1,6 +1,6 @@ from django.db import models from imagekit.models import ImageSpecField -from imagekit.processors import ResizeToFill +from imagekit.processors import ResizeToFit class Picture(models.Model): @@ -12,7 +12,7 @@ class Picture(models.Model): #file = models.FileField(upload_to="pictures") file = models.ImageField(upload_to="pictures") - thumbnail = ImageSpecField([ResizeToFill(50, 50)], image_field='file', + thumbnail = ImageSpecField([ResizeToFit(height=50)], image_field='file', format='JPEG', options={'quality': 90}) description = models.CharField(max_length=200, blank=True) slug = models.SlugField(max_length=50, blank=True)