Merge branch 'master' into v0.9

Conflicts:
	ishtar_common/migrations/0030_auto__add_state__chg_field_sourcetype_txt_idx__chg_field_authortype_tx.py

1 files changed, 10 insertions, 2 deletions

diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index 7ab09f9f7..e2c0e5db5 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -135,7 +135,9 @@ class TargetKeyForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super(TargetKeyForm, self).__init__(*args, **kwargs)
         instance = getattr(self, 'instance', None)
+        self.associated_import = None
         if instance and instance.pk:
+            self.associated_import = instance.associated_import
             self.fields['target'].widget.attrs['readonly'] = True
             self.fields['key'].widget.attrs['readonly'] = True
             self.fields['key'].widget.attrs['title'] = unicode(instance)
@@ -162,7 +164,7 @@ class TargetKeyForm(forms.ModelForm):
         super(TargetKeyForm, self).save(commit)
         if self.cleaned_data.get('value'):
             self.instance.is_set = True
-            self.associated_import = None
+            self.instance.associated_import = self.associated_import
             self.instance.save()
 
 
@@ -579,6 +581,7 @@ class AccountForm(forms.Form):
         widget=forms.PasswordInput, required=False)
 
     def __init__(self, *args, **kwargs):
+        person = None
         if 'initial' in kwargs and 'pk' in kwargs['initial']:
             try:
                 person = models.Person.objects.get(pk=kwargs['initial']['pk'])
@@ -589,7 +592,12 @@ class AccountForm(forms.Form):
                     kwargs['initial']['email'] = account.email
             except ObjectDoesNotExist:
                 pass
-        return super(AccountForm, self).__init__(*args, **kwargs)
+        if 'person' in kwargs:
+            person = kwargs.pop('person')
+        super(AccountForm, self).__init__(*args, **kwargs)
+        if person:
+            self.fields['username'].initial = \
+                person.raw_name.lower().replace(' ', '.')
 
     def clean(self):
         cleaned_data = self.cleaned_data