~widelands-dev/widelands-website/trunk

« back to all changes in this revision

Viewing changes to wlimages/views.py

  • Committer: Holger Rapp
  • Date: 2010-01-01 21:35:23 UTC
  • mto: (173.3.2 widelands)
  • mto: This revision was merged to the branch mainline in revision 176.
  • Revision ID: rapp@mrt.uka.de-20100101213523-53rcapbemm69ep6u
Made the site compatible to django 1.1 and all the various packages

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
from django.shortcuts import get_object_or_404, render_to_response
 
2
from django.http import HttpResponse, HttpResponseRedirect
1
3
from django.contrib.auth.decorators import login_required
 
4
from django.core.urlresolvers import reverse
2
5
from django.contrib.contenttypes.models import ContentType
3
 
from django.core.urlresolvers import reverse
4
 
from django.http import HttpResponse, HttpResponseRedirect
5
 
from django.shortcuts import get_object_or_404, render_to_response
6
 
from django.template import RequestContext
7
6
 
8
7
from models import Image
9
8
from settings import MEDIA_ROOT
23
22
    return request.META['REMOTE_ADDR']
24
23
 
25
24
def display( request, image, revision ):
 
25
    print "revision:", revision
 
26
    print "image:", image
 
27
 
 
28
    
26
29
    revision = int(revision)
27
30
 
28
31
    img = get_object_or_404( Image, name = image, revision = revision )
29
 
 
 
32
    
30
33
    extension = img.image.path[-3:].lower()
31
34
    if extension not in ("png","gif","jpg","bmp"):
32
35
        extension = "png"
42
45
    if request.method == 'POST':
43
46
        form = UploadImageForm(request.POST, request.FILES) # A form bound to the POST data
44
47
        if form.is_valid(): # All validation rules pass
45
 
            Image.objects.create_and_save_image(user=request.user,image=request.FILES["imagename"],
 
48
            Image.objects.create_and_save_image(user=request.user,image=request.FILES["imagename"], 
46
49
                        content_type=ContentType.objects.get(pk=content_type),object_id=object_id, ip=get_real_ip(request))
47
 
 
 
50
            
48
51
            return HttpResponseRedirect(next) # Redirect after POST
49
52
    else:
50
53
        form = UploadImageForm() # An unbound form
51
54
 
52
55
    return render_to_response('wlimages/upload.html', {
53
 
        'upload_form': form, 
54
 
    }, context_instance=RequestContext(request))
 
56
        'upload_form': form,
 
57
    })
55
58