Revision 93677203

b/api/images.py
118 118
    #                       unauthorized (401),
119 119
    #                       badRequest (400),
120 120
    #                       overLimit (413)
121

  
121
    
122
    user_images = Image.objects.filter(Q(owner=request.user) | Q(public=True))
122 123
    since = util.isoparse(request.GET.get('changes-since'))
123
    owner = request.user
124 124
    
125
    avail_images = Image.objects.filter(Q(owner=owner) | Q(public=True))
126 125
    if since:
127
        avail_images = avail_images.filter(updated__gte=since)
128
        if not avail_images:
126
        user_images = user_images.filter(updated__gte=since)
127
        if not user_images:
129 128
            return HttpResponse(status=304)
129
    else:
130
        user_images = user_images.exclude(state='DELETED')
131
    
132
    images = [image_to_dict(image, detail) for image in user_images]
130 133
    
131
    images = [image_to_dict(image, detail) for image in avail_images]
132

  
133 134
    if request.serialization == 'xml':
134 135
        data = render_to_string('list_images.xml', {
135 136
            'images': images,
......
205 206
    #                       overLimit (413)
206 207

  
207 208
    image = util.get_image(image_id, request.user)
208
    image.delete()
209
    image.state = 'DELETED'
210
    image.save()
209 211
    return HttpResponse(status=204)
210 212

  
211 213
@util.api_method('GET')

Also available in: Unified diff