petites corrections mineurs

accounts/models.py

@@ -17,4 +17,4 @@ class Profile(models.Model):
         verbose_name = 'profil'
 
     def __str__(self):
-        return str(self.user)
+        return self.user.get_full_name() or self.user.username

adhesions/admin.py

@@ -71,7 +71,7 @@ class UserIsAdherentFilter(admin.SimpleListFilter):
 
 class UserAdmin(AuthUserAdmin):
     list_display = AuthUserAdmin.list_display + ('get_adhesion_link',)
-    list_filter = (AuthUserAdmin.list_filter[2], UserIsAdherentFilter) # [2] = actif
+    list_filter = AuthUserAdmin.list_filter + (UserIsAdherentFilter,)
 
     def get_adhesion_link(self, user):
         adhesion = user.adhesion

services/models.py

@@ -117,7 +117,8 @@ class ResourceAllocation(models.Model):
 
     @property
     def active(self):
-        return ResourceAllocation.objects.filter(pk=self.pk).filter(get_active_filter()).exists()
+        now = timezone.now()
+        return self.start <= now and (self.end is None or self.end >= now)
 
     def clean(self):
         super().clean()
@@ -134,12 +135,6 @@ class ResourceAllocation(models.Model):
                 raise ValidationError("La période d’allocation de cette ressource chevauche "
                                         "avec une période d’allocation précédente.")
 
-    # Penser à appeler la méthode save !
-    def deallocate(self):
-        if not self.active:
-            raise PermissionDenied
-        self.end = timezone.now()
-
     class Meta:
         verbose_name = 'allocation'
         verbose_name_plural = 'allocations'

services/signals.py

@@ -17,7 +17,6 @@ def ip_prefix(sender, instance, created, **kwargs):
             ip.prefixes.remove(instance)
 
 
-
 @receiver(post_save, sender=IPResource, dispatch_uid='ip_resource')
 def ip_resource(sender, instance, created, **kwargs):
     address = ip_address(instance.ip)