Merge master for RC

[laas.git] / src / account / forms.py

diff --git a/src/account/forms.py b/src/account/forms.py
index dd1a0a9..28cb27d 100644 (file)
--- a/src/account/forms.py
+++ b/src/account/forms.py
@@ -18,11 +18,12 @@ from account.models import UserProfile
 class AccountSettingsForm(forms.ModelForm):
     class Meta:
         model = UserProfile
-        fields = ['company', 'email_addr', 'ssh_public_key', 'pgp_public_key', 'timezone']
+        fields = ['company', 'email_addr', 'public_user', 'ssh_public_key', 'pgp_public_key', 'timezone']
         labels = {
             'email_addr': _('Email Address'),
             'ssh_public_key': _('SSH Public Key'),
-            'pgp_public_key': _('PGP Public Key')
+            'pgp_public_key': _('PGP Public Key'),
+            'public_user': _('Public User')
         }
 
     timezone = forms.ChoiceField(choices=[(x, x) for x in pytz.common_timezones], initial='UTC')