Revision 2987cd8a

b/api/servers.py
154 154
    #                       unauthorized (401),
155 155
    #                       badRequest (400),
156 156
    #                       overLimit (413)
157

  
157
    
158
    user_vms = VirtualMachine.objects.filter(owner=request.user)
158 159
    since = util.isoparse(request.GET.get('changes-since'))
159

  
160
    
160 161
    if since:
161
        user_vms = VirtualMachine.objects.filter(owner=request.user,
162
                                                updated__gte=since)
162
        user_vms = user_vms.filter(updated__gte=since)
163 163
        if not user_vms:
164 164
            return HttpResponse(status=304)
165 165
    else:
166
        user_vms = VirtualMachine.objects.filter(owner=request.user,
167
                                                deleted=False)
166
        user_vms = user_vms.filter(deleted=False)
168 167
    
169 168
    servers = [vm_to_dict(server, detail) for server in user_vms]
170 169

  
b/db/models.py
437 437
    ipv6 = models.CharField(max_length=100, null=True)
438 438
    firewall_profile = models.CharField(choices=FIREWALL_PROFILES,
439 439
                                        max_length=30, null=True)
440
    
441
    def __unicode__(self):
442
        return '%s@%s' % (self.machine.name, self.network.name)
440 443

  
441 444

  
442 445
class NetworkLink(models.Model):
......
444 447
    index = models.IntegerField()
445 448
    name = models.CharField(max_length=255)
446 449
    available = models.BooleanField(default=True)
450
    
451
    def __unicode__(self):
452
        return self.name

Also available in: Unified diff