#200 Ajout possiblité de personnaliser forumaire info membre selon pays

Open
josue wants to merge 2 commits from josue/country_settings into FFDN/master
2 changed files with 10 additions and 3 deletions
  1. 3 3
      coin/members/models.py
  2. 7 0
      coin/settings_base.py

+ 3 - 3
coin/members/models.py

@@ -99,14 +99,14 @@ class Member(CoinLdapSyncMixin, AbstractUser):
     # support more countries and address types)
     address = models.TextField(
         verbose_name='adresse postale', blank=True, null=True)
-    postal_code = models.CharField(max_length=5, blank=True, null=True,
-                                   validators=[RegexValidator(regex=r'^\d{5}$',
+    postal_code = models.CharField(max_length=settings.POSTCODE_MAX_LENGTH, blank=True, null=True,
+                                   validators=[RegexValidator(regex=r'^\d{' + str(settings.POSTCODE_MIN_LENGTH) + r',' + str(settings.POSTCODE_MAX_LENGTH) + r'}$',
                                                               message='Code postal non valide.')],
                                    verbose_name='code postal')
     city = models.CharField(max_length=200, blank=True, null=True,
                             verbose_name='commune')
     country = models.CharField(max_length=200, blank=True, null=True,
-                               default='France',
+                               default=settings.DEFAULT_COUNTRY,
                                verbose_name='pays')
     resign_date = models.DateField(null=True, blank=True,
                                    verbose_name="date de départ de "

+ 7 - 0
coin/settings_base.py

@@ -57,6 +57,13 @@ USE_L10N = True
 # If you set this to False, Django will not use timezone-aware datetimes.
 USE_TZ = True
 
+# Postcode length
+POSTCODE_MIN_LENGTH = 5
+POSTCODE_MAX_LENGTH = 5
+
+# Default country
+DEFAULT_COUNTRY = "France"
+
 # Default URL for login and logout
 LOGIN_URL = '/members/login'
 LOGIN_REDIRECT_URL = '/members'