POC Campus Condorcet : correction reentrance et donnees d'initialisation

django/sp_sso/saml/forms.py

@@ -1,7 +1,5 @@
 from django import forms
-#from .utils import ldap_get_etablissements, ldap_get_unites
 from .utils import ldap_get_unites, ldap_get_etablissements
-from .utils import get_form_init_data
 
 
 AFFILIATION_CHOICES = (
@@ -26,14 +24,13 @@ UNITE_CHOICES = ()
 
 class RegistrationForm(forms.Form):
 
-    user_help_msg = ""
-    user_nickname = ""
+    user_help_msg = ''
+    user_nickname = ''
 
     def __init__(self, *args, **kwargs):
         super(RegistrationForm, self).__init__(*args, **kwargs)
-        form_init_data = get_form_init_data()
-        self.user_help_msg = form_init_data['user_help_msg']
-        self.user_nickname = form_init_data['user_nickname']
+        self.user_nickname = kwargs['initial'].get('user_nickname', '')
+        self.user_help_msg = kwargs['initial'].get('user_help_msg')
 
     nom = forms.CharField(max_length=100, label="Nom")
     prenom = forms.CharField(max_length=100, label="Prenom")

django/sp_sso/saml/utils.py

@@ -28,17 +28,6 @@ sso_attributes = ['prenom',
                   's_entite_affectation',
                   's_emp_corps',
                   's_liste_rouge']
-form_init_data = {
-    'user_help_msg':"Completez votre demande et validez votre demande d'inscription",
-    'user_nickname':""
-}
-
-def get_form_init_data():
-    return form_init_data
-
-def set_form_init_data(init_data):
-    for key, value in init_data.items():
-        form_init_data[key] = value
 
 def craft_user_nickname(mellon_dict):
     prenom = mellon_dict.get('prenom')[0]

django/sp_sso/saml/views.py

@@ -3,8 +3,7 @@ from django.shortcuts import render
 
 from .forms import RegistrationForm
 from .utils import ldap_contains_user, wcs_submit, \
-                   sso_attributes, set_form_init_data, \
-                   craft_user_nickname
+                   sso_attributes, craft_user_nickname
 
 
 # TODOs
@@ -38,15 +37,6 @@ class RegistrationFormView(FormView):
     template_name = 'registration_form.html'
     success_url = '/register/wcs_post' # Mandatory?
 
-
-    def dispatch(self, request, *args, **kwargs):
-        if 'mellon_session' in request.session:
-            set_form_init_data({'user_help_msg':
-                                "Confirmez les elements ci-dessous, completez votre demande et validez votre demande d'inscription",
-                                'user_nickname':
-                                craft_user_nickname(request.session['mellon_session'])})
-        return super(RegistrationFormView, self).dispatch(request, *args, **kwargs)
-
     def get_initial(self):
         initial = super(RegistrationFormView, self).get_initial()
 
@@ -54,6 +44,11 @@ class RegistrationFormView(FormView):
             for attribute in sso_attributes:
                 attribute_element = self.request.session['mellon_session'].get(attribute, [''])[0]
                 initial[attribute] = str(attribute_element)
+            initial['user_nickname'] = craft_user_nickname(self.request.session['mellon_session'])
+            initial['user_help_msg'] = "Confirmez les elements ci-dessous, completez votre demande et validez votre demande d'inscription"
+        else:
+            initial['user_help_msg'] = "Completez votre demande et validez votre demande d'inscription"
+
         return initial
 
     def form_valid(self, form):