equal
deleted
inserted
replaced
23 ] |
23 ] |
24 |
24 |
25 |
25 |
26 import logging |
26 import logging |
27 |
27 |
|
28 from google.appengine.api import users |
28 from google.appengine.ext import db |
29 from google.appengine.ext import db |
|
30 |
29 from django.utils.translation import ugettext_lazy |
31 from django.utils.translation import ugettext_lazy |
30 |
32 |
31 from soc.models import base |
33 from soc.models import base |
32 from soc.views.helpers import forms_helpers |
34 from soc.views.helpers import forms_helpers |
33 |
35 |
55 #: This email address is only used in an automated fashion by |
57 #: This email address is only used in an automated fashion by |
56 #: Melange web applications and is not made visible to other users |
58 #: Melange web applications and is not made visible to other users |
57 #: of any Melange application. |
59 #: of any Melange application. |
58 id = db.UserProperty(required=True) |
60 id = db.UserProperty(required=True) |
59 |
61 |
|
62 #: A list (possibly empty) of former Google Accounts associated with |
|
63 #: this User. |
|
64 former_ids = db.ListProperty(users.User) |
|
65 |
60 #: Required field storing a nickname; displayed publicly. |
66 #: Required field storing a nickname; displayed publicly. |
61 #: Nicknames can be any valid UTF-8 text. |
67 #: Nicknames can be any valid UTF-8 text. |
62 nick_name = db.StringProperty(required=True, |
68 nick_name = db.StringProperty(required=True, |
63 verbose_name=ugettext_lazy('Nick name')) |
69 verbose_name=ugettext_lazy('Nick name')) |
64 |
70 |