From f640a6334003fa5df2a68ac8704c25b01660e911 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 14 Jan 2014 14:54:43 +0100 Subject: [PATCH] bump debian changelog --- debian/changelog | 7 +++++-- extra/modules/root.ptl | 2 +- extra/modules/store.py | 24 ++++++++++++++++-------- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 858aaf5..0910a49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -authentic-ifef (1.0.51) UNRELEASED; urgency=low +authentic-ifef (1.0.52) stable; urgency=low * adapt to new behaviour of TextsDirectory.get_html_text * add default cnil disclaimer and terms of use + * only keep fields first name, last name, date of birth, email and username + on registration page. + * remove classification form - -- Benjamin Dauvergne Mon, 13 Jan 2014 23:11:20 +0100 + -- Benjamin Dauvergne Tue, 14 Jan 2014 14:54:31 +0100 authentic-ifef (1.0.50) lenny-ifef; urgency=low diff --git a/extra/modules/root.ptl b/extra/modules/root.ptl index 68a026d..0a0f3af 100644 --- a/extra/modules/root.ptl +++ b/extra/modules/root.ptl @@ -99,7 +99,7 @@ class IfefRootDirectory(authentic.root.RootDirectory): else: form.add(HtmlWidget, htmltext('

%s

') % _('A password will be mailed to you.')) - add_classification = True + add_classification = False if keys and 'classification' not in keys: add_classification = False diff --git a/extra/modules/store.py b/extra/modules/store.py index b9f033c..37d4123 100644 --- a/extra/modules/store.py +++ b/extra/modules/store.py @@ -27,6 +27,7 @@ class IdentitiesStoreIFEF(IdentitiesStoreLdap): Field('sn', N_('Last name'), required=True, admin_required=True), Field('givenName', N_('First name'), required=True, admin_required=True), Field('c', N_('Language'), widget_class='SingleSelectWidget', + on_register=False, options=[ ('fr', N_('French')), ('it', N_('Italian')), @@ -36,8 +37,8 @@ class IdentitiesStoreIFEF(IdentitiesStoreLdap): ('es', N_('Spanish')), ], size=10), Field('dateOfBirth', N_('Birth date'), hint=_('jj/mm/aaaa'), - on_register=True, widget_class='DateWidget', jquery=False), - Field('placeOfBirth', N_('Birth place')), + widget_class='DateWidget', jquery=False, required=True), + Field('placeOfBirth', N_('Birth place'), on_register=False), # Contact Field('email', N_('Email'), hint=_("example: john@example.com"), required=True, @@ -46,10 +47,10 @@ class IdentitiesStoreIFEF(IdentitiesStoreLdap): regex=r'[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}', unique=True), # Addresses postales - Field('street', N_('Professional address')), + Field('street', N_('Professional address'), on_register=False), Field('postalCode', N_('Professional postal code'), widget_class='ValidatedStringWidget', - regex=r'[0-9]{5}', hint=_('Only digits.')), - Field('l', N_('Professional city')), + regex=r'[0-9]{5}', hint=_('Only digits.'), on_register=False), + Field('l', N_('Professional city'), on_register=False), Field('st', N_('Professional region'), on_register=False), Field('department', N_('Professional department'), on_register=False), Field('homeStreetAdddress', N_('Personnal address'), on_register=False), @@ -60,28 +61,35 @@ class IdentitiesStoreIFEF(IdentitiesStoreLdap): Field('homeDepartment', N_('Personnal department'), on_register=False), Field('userClass', N_('User class'), read_only=True, value=['GRAND.PUBLIC'], + on_register=False, admin_required=True, size=4, widget_class='SingleSelectWidget', options=['GRAND.PUBLIC', 'EMPLOYEUR', 'SAL.SPE/ASSMAT', 'PRO.FORMA', 'INDIV.PART', 'SAL.IFEF' ], multivalued=True), # Telephone Field('mobile', N_('Mobile phone'), + on_register=False, hint=_('Only numbers, dots or spaces.'), widget_class='ValidatedStringWidget', - regex=r'^ *(|[0-9][0-9. ]*) *$', on_register=False), + regex=r'^ *(|[0-9][0-9. ]*) *$'), Field('homePhone', N_('Telephone perso'), + on_register=False, hint=_('Only numbers, dots or spaces.'), widget_class='ValidatedStringWidget', regex=r'^ *(|[0-9][0-9. ]*) *$'), Field('telephoneNumber', N_('Telephone pro'), + on_register=False, hint=_('Only numbers, dots or spaces.'), widget_class='ValidatedStringWidget', - regex=r'^ *(|[0-9][0-9. ]*) *$', on_register=False), + regex=r'^ *(|[0-9][0-9. ]*) *$'), # Web Field('microBlogURL', N_('Twitter account'), + on_register=False, hint=_("example: @twitter, identica, etc.")), Field('socialNetworkURL', N_('Social network account'), + on_register=False, hint=_("example: compte facebook, linkedin, viadeo, etc.")), - Field('labeledURI', N_('Personnal WEB page')), + Field('labeledURI', N_('Personnal WEB page'), + on_register=False), Field('voipURI', N_("VoIP address"), hint=_("example: skype, sip, gtalk"), on_register=False),