clubs: regex moins chiante sur les noms
This commit is contained in:
parent
3cbbb2303f
commit
f199947a5d
2 changed files with 2 additions and 2 deletions
|
@ -363,7 +363,7 @@ class nom(Attr):
|
||||||
|
|
||||||
def parse_value(self, nom):
|
def parse_value(self, nom):
|
||||||
if self.parent != None:
|
if self.parent != None:
|
||||||
if u'club' in [str(o) for o in self.parent['objectClass']]:
|
if u'club' in [o.value for o in self.parent['objectClass']]:
|
||||||
self.value = validate_name(nom,"0123456789\[\]")
|
self.value = validate_name(nom,"0123456789\[\]")
|
||||||
else:
|
else:
|
||||||
self.value = validate_name(nom)
|
self.value = validate_name(nom)
|
||||||
|
|
|
@ -206,7 +206,7 @@ def format_tel(tel):
|
||||||
def validate_name(value, more_chars=""):
|
def validate_name(value, more_chars=""):
|
||||||
"""Valide un nom: ie un unicode qui contient lettres, espaces et
|
"""Valide un nom: ie un unicode qui contient lettres, espaces et
|
||||||
apostrophes, et éventuellement des caractères additionnels"""
|
apostrophes, et éventuellement des caractères additionnels"""
|
||||||
if re.match("^[A-Za-z0-9]([-' %s]?[A-Za-z0-9])*$" % more_chars,
|
if re.match("^[A-Za-z0-9]([-' %s]?[A-Za-z0-9]?)*$" % more_chars,
|
||||||
normalize('NFKD', value).encode('ASCII', 'ignore')):
|
normalize('NFKD', value).encode('ASCII', 'ignore')):
|
||||||
return unicode(value)
|
return unicode(value)
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue