← Back to branch summary

~widelands-dev/widelands-website/trunk

« back to all changes in this revision

Viewing changes to wlimages/views.py

  • Committer: franku
  • Author(s): GunChleoc
  • Date: 2016-12-13 18:30:38 UTC
  • mfrom: (438.1.6 pyformat_util)
  • Revision ID: somal@arcor.de-20161213183038-5cgmvfh2fkgmoc1s
adding a script to run pyformat over the code base

Show diffs side-by-side

added added

removed removed

Lines of Context:
wlimages/views.py
8
8
from wl_utils import get_real_ip
9
9
from forms import UploadImageForm
10
10
 
11
 
def display( request, image, revision ):
 
11
 
 
12
def display(request, image, revision):
12
13
    revision = int(revision)
13
14
 
14
 
    img = get_object_or_404( Image, name = image, revision = revision )
 
15
    img = get_object_or_404(Image, name=image, revision=revision)
15
16
 
16
17
    extension = img.image.path[-3:].lower()
17
 
    if extension not in ("png","gif","jpg","bmp"):
18
 
        extension = "png"
 
18
    if extension not in ('png', 'gif', 'jpg', 'bmp'):
 
19
        extension = 'png'
19
20
 
20
21
    r = HttpResponse()
21
22
    r['Content-Type'] = 'image/%s' % extension
23
24
 
24
25
    return r
25
26
 
 
27
 
26
28
@login_required
27
 
def upload(request,content_type,object_id, next="/"):
 
29
def upload(request, content_type, object_id, next='/'):
28
30
    if request.method == 'POST':
29
 
        form = UploadImageForm(request.POST, request.FILES) # A form bound to the POST data
30
 
        if form.is_valid(): # All validation rules pass
31
 
            Image.objects.create_and_save_image(user=request.user,image=request.FILES["imagename"],
32
 
                        content_type=ContentType.objects.get(pk=content_type),object_id=object_id, ip=get_real_ip(request))
33
 
            return HttpResponseRedirect(next) # Redirect after POST
 
31
        # A form bound to the POST data
 
32
        form = UploadImageForm(request.POST, request.FILES)
 
33
        if form.is_valid():  # All validation rules pass
 
34
            Image.objects.create_and_save_image(user=request.user, image=request.FILES['imagename'],
 
35
                                                content_type=ContentType.objects.get(pk=content_type), object_id=object_id, ip=get_real_ip(request))
 
36
            return HttpResponseRedirect(next)  # Redirect after POST
34
37
    else:
35
 
        form = UploadImageForm() # An unbound form
36
 
    
 
38
        form = UploadImageForm()  # An unbound form
 
39
 
37
40
    # Get the App (model) to which this image belongs to:
38
41
    app = ContentType.objects.get(id=content_type)
39
42
    # Get the current object's name (provided by __unicode__()) from this model
43
46
        'upload_form': form,
44
47
        'referer': name,
45
48
    }, context_instance=RequestContext(request))
46