From 14469c05e74a394d8d60ae90b7ea42acf00c8f50 Mon Sep 17 00:00:00 2001 From: chirac Date: Sat, 8 Oct 2016 10:46:55 +0200 Subject: [PATCH] =?UTF-8?q?Corrige=20un=20probl=C3=A8me=20de=20coh=C3=A9re?= =?UTF-8?q?nce,=20le=20models=20ne=20peut=20contenir=20en=20argument=20une?= =?UTF-8?q?=20liste=20d'objet=20d'autres=20models?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- machines/models.py | 11 +++-------- re2o/settings.py | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/machines/models.py b/machines/models.py index 5fdc9758..a4c38aec 100644 --- a/machines/models.py +++ b/machines/models.py @@ -4,7 +4,7 @@ from django.dispatch import receiver from django.forms import ValidationError from macaddress.fields import MACAddressField - +from re2o.settings import MAIN_EXTENSION class Machine(models.Model): @@ -35,7 +35,7 @@ class Interface(models.Model): machine = models.ForeignKey('Machine', on_delete=models.CASCADE) type = models.ForeignKey('MachineType', on_delete=models.PROTECT) details = models.CharField(max_length=255, blank=True) - dns = models.CharField(help_text="Obligatoire et unique, doit se terminer en %s et ne pas comporter d'autres points" % ", ".join(Extension.objects.values_list('name', flat=True)), max_length=255, unique=True) + dns = models.CharField(help_text="Obligatoire et unique, doit se terminer par exemple en %s et ne pas comporter d'autres points" % MAIN_EXTENSION, max_length=255, unique=True) def is_active(self): """ Renvoie si une interface doit avoir accès ou non """ @@ -43,11 +43,6 @@ class Interface(models.Model): user = self.machine.user return machine.active and user.has_access() - #def save(self, *args, **kwargs): - # user = self.machine.user - # user.ldap_sync(base=False, access_refresh=False, mac_refresh=True) - # super(Interface, self).save(*args, **kwargs) - def __str__(self): return self.dns @@ -66,4 +61,4 @@ def interface_post_save(sender, **kwargs): @receiver(post_delete, sender=Interface) def interface_post_delete(sender, **kwargs): user = kwargs['instance'].machine.user - #user.ldap_sync(base=False, access_refresh=False, mac_refresh=True) + user.ldap_sync(base=False, access_refresh=False, mac_refresh=True) diff --git a/re2o/settings.py b/re2o/settings.py index 58204747..cc8437bf 100644 --- a/re2o/settings.py +++ b/re2o/settings.py @@ -12,7 +12,7 @@ https://docs.djangoproject.com/en/1.8/ref/settings/ # Build paths inside the project like this: os.path.join(BASE_DIR, ...) import os -from .settings_local import SECRET_KEY, DATABASES, DEBUG, ALLOWED_HOSTS, ASSO_NAME, ASSO_ADDRESS_LINE1, ASSO_ADDRESS_LINE2, ASSO_SIRET, ASSO_EMAIL, ASSO_PHONE, LOGO_PATH, services_urls, REQ_EXPIRE_HRS, REQ_EXPIRE_STR, EMAIL_FROM, SITE_NAME, LDAP, UID_RANGES +from .settings_local import SECRET_KEY, DATABASES, DEBUG, ALLOWED_HOSTS, ASSO_NAME, ASSO_ADDRESS_LINE1, ASSO_ADDRESS_LINE2, ASSO_SIRET, ASSO_EMAIL, ASSO_PHONE, LOGO_PATH, services_urls, REQ_EXPIRE_HRS, REQ_EXPIRE_STR, EMAIL_FROM, SITE_NAME, LDAP, MAIN_EXTENSION, UID_RANGES BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))