entrouvert
/
paul-synchro
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

POC Campus Condorcet : affiliate ou member est une affiliation supplementaire

This commit is contained in:
Paul Marillonnet 2017-09-26 11:28:51 +02:00
parent 0e1ffeca84
commit 0597ef286f
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/sp_sso/saml/forms.py
View File

@ -86,11 +86,11 @@ class RegistrationForm(forms.Form):
self.fields[field].widget.attrs['readonly'] = True
if kwargs['initial'].get('yet_member', '') is False:
additional_choice = (('affiliate', _('Affiliate')),)
extra_affiliation = (('affiliate', _('Affiliate')),)
else:
additional_choice = (('member', _('Member')),)
actual_affiliation_choices = AFFILIATION_CHOICES + additional_choice
self.fields['ep_primary_affiliation'].choices = actual_affiliation_choices
extra_affiliation = (('member', _('Member')),)
self.fields['ep_affiliation'].choices = extra_affiliation
self.fields['ep_affiliation'].widget.attrs['readonly'] = True
nom = forms.CharField(max_length=100, label=_("Last name"))
prenom = forms.CharField(max_length=100, label=_("First name"))
@ -111,7 +111,7 @@ class RegistrationForm(forms.Form):
)
# eduPersonPrimaryAffiliation
ep_affiliation = forms.MultipleChoiceField(
required=False, choices=AFFILIATION_CHOICES, label=_("Affiliations"))
required=False, choices=AFFILIATION_CHOICES, label=_("Extra affiliations"))
# s_* -> supannPerson attributes:
# supannEtablissement

1
django/sp_sso/templates/declare_form.html
View File

@ -20,6 +20,7 @@
{% include "registration_field.html" with field=form.s_etablissement %}
{% include "registration_field.html" with field=form.invite_unite %}
{% include "registration_field.html" with field=form.ep_primary_affiliation %}
{% include "registration_field.html" with field=form.ep_affiliation %}
{% include "registration_field.html" with field=form.s_emp_corps %}
{% include "registration_field.html" with field=form.s_liste_rouge %}
{{ form.ep_principal_name.as_hidden }}

1
django/sp_sso/templates/registration_form.html
View File

@ -19,6 +19,7 @@
{% include "registration_field.html" with field=form.email %}
{% include "registration_field.html" with field=form.s_etablissement %}
{% include "registration_field.html" with field=form.ep_primary_affiliation %}
{% include "registration_field.html" with field=form.ep_affiliation %}
{% include "registration_field.html" with field=form.s_emp_corps %}
{% include "registration_field.html" with field=form.s_liste_rouge %}
</p>