Merge pull request #785 from tonioo/new_profile_fields_673

New profile fields

modoboa/core/forms.py

@@ -45,7 +45,8 @@ class ProfileForm(forms.ModelForm):
 
     class Meta:
         model = User
-        fields = ("first_name", "last_name", "language")
+        fields = ("first_name", "last_name", "language",
+                  "phone_number", "secondary_email")
         widgets = {
             'first_name': forms.TextInput(attrs={'class': 'form-control'}),
             'last_name': forms.TextInput(attrs={'class': 'form-control'})

modoboa/core/migrations/0006_auto_20151114_1518.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0005_user_language'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='phone_number',
+            field=models.CharField(max_length=128, null=True, verbose_name='Phone number', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='secondary_email',
+            field=models.EmailField(help_text='An alternative e-mail address, can be used for recovery needs.', max_length=254, null=True, verbose_name='Secondary email', blank=True),
+            preserve_default=True,
+        ),
+    ]

modoboa/core/models.py

@@ -68,6 +68,14 @@ class User(PermissionsMixin):
             "Prefered language to display pages."
         )
     )
+    phone_number = models.CharField(
+        ugettext_lazy("Phone number"), max_length=128, blank=True, null=True)
+    secondary_email = models.EmailField(
+        ugettext_lazy("Secondary email"), max_length=254,
+        blank=True, null=True,
+        help_text=ugettext_lazy(
+            "An alternative e-mail address, can be used for recovery needs.")
+    )
 
     objects = UserManager()