request: restore le préremplissage des informations de contact depuis le LDAP, fixes #1932

This commit is contained in:
Benjamin Dauvergne 2012-11-29 00:09:57 +01:00
parent a92cfc962d
commit c7fbd34b80
1 changed files with 9 additions and 11 deletions

View File

@ -121,15 +121,6 @@ class RequestWizardView(NamedUrlSessionWizardView, SingleObjectMixin):
self.request.user)
return kwargs
def get_form_initial(self, step):
initial = super(RequestWizardView, self).get_form_initial(step=step) or {}
initial['contact_email'] = getattr(self.request.user, 'mail', '')
initial['contact_telephone1'] = getattr(self.request.user, 'telephoneNumber', '')
initial['contact_telephone2'] = getattr(self.request.user, 'supannAutreTelephone', '')
initial['contact_bureau'] = getattr(self.request.user, 'roomNumber', '')
initial['sponsor'] = '%(first_name)s %(last_name)s' % self.request.user._wrapped.__dict__
return initial
def get_context_data(self, form, **kwargs):
'''
Add all_forms = list of (step, form, pprint_data), where pprint_data is
@ -296,8 +287,15 @@ class RequestHistory(DetailView):
@login_required
@transaction.commit_on_success
def new_request(request):
request = Request.objects.create(user=request.user,
status=get_default_status())
request = Request.objects.create(
user=request.user,
status=get_default_status(),
contact_email=getattr(request.user, 'email', ''),
contact_telephone1=getattr(request.user, 'telephoneNumber', ''),
contact_telephone2=getattr(request.user, 'supannAutreTelephone', ''),
contact_bureau=getattr(request.user, 'roomNumber', ''),
sponsor='%(first_name)s %(last_name)s (%(username)s)' % request.user._wrapped.__dict__
)
return redirect('request_wizard', pk=request.pk)
@transaction.commit_on_success