diff options
Diffstat (limited to 'ishtar_common/forms_common.py')
| -rw-r--r-- | ishtar_common/forms_common.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index 48d0fdc7b..eb4582c3e 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -857,9 +857,15 @@ class AccountForm(IshtarForm): if 'person' in kwargs: person = kwargs.pop('person') super(AccountForm, self).__init__(*args, **kwargs) - if person and person.raw_name: - self.fields['username'].initial = \ - person.raw_name.lower().replace(' ', '.') + if person and (person.raw_name or (person.name and person.surname)): + profile = models.IshtarSiteProfile.get_current_profile() + if person.name and person.surname: + values = [person.name.lower(), person.surname.lower()] + else: + values = person.raw_name.lower().split(" ") + if profile.account_naming_style == "FN" and len(values) > 1: + values = values[1:] + [values[0]] + self.fields['username'].initial = ".".join(values) def clean(self): cleaned_data = self.cleaned_data @@ -916,7 +922,7 @@ class FinalAccountForm(forms.Form): def __init__(self, *args, **kwargs): self.is_hidden = True - return super(FinalAccountForm, self).__init__(*args, **kwargs) + super(FinalAccountForm, self).__init__(*args, **kwargs) class ProfilePersonForm(forms.Form): |