diff options
| author | Weitian LI <liweitianux@gmail.com> | 2014-06-07 13:06:21 +0800 |
|---|---|---|
| committer | Weitian LI <liweitianux@gmail.com> | 2014-06-07 13:08:11 +0800 |
| commit | bd5a374373581e16dc6489ba6216cd3743acc3e7 (patch) | |
| tree | 0ba8fc8a085e6a7b47a7bdcb2f787efaebcfbbd9 /account/models.py | |
| parent | e9a9956634b7ba0bdc0dab47cf6e3ab01c7f9c4b (diff) | |
| download | django-skaschool-bd5a374373581e16dc6489ba6216cd3743acc3e7.tar.bz2 | |
Added fields 'sjtu_id' & 'sjtu_initpass' to UserProfile model
* added fields 'sjtu_id' & 'sjtu_initpass' to UserProfile model
* updated 'dump()' and 'dump_fieldnames()' method
* updated 'UserProfileAdmin' to show these fields
* added south migration 0004 for newly added two fields
Diffstat (limited to 'account/models.py')
| -rw-r--r-- | account/models.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/account/models.py b/account/models.py index 0565731..62276b8 100644 --- a/account/models.py +++ b/account/models.py @@ -91,6 +91,11 @@ class UserProfile(models.Model): choices=SPONSORED_STATUS, default='C') is_checkin = models.CharField(_("Is checkin"), max_length=1, choices=CHECKIN_STATUS, default='X') + # student id & initial password provided by sjtu jwc + sjtu_id = models.CharField(_("SJTU student ID"), + max_length=15, blank=True) + sjtu_initpass = models.CharField(_("SJTU initial password"), + max_length=10, blank=True) class Meta: verbose_name = _('user profile') @@ -202,6 +207,8 @@ class UserProfile(models.Model): 'reason': self._meta.get_field_by_name('reason')[0].verbose_name, 'transcript': self._meta.get_field_by_name('transcript')[0].verbose_name, 'supplement': self._meta.get_field_by_name('supplement')[0].verbose_name, + 'sjtu_id': self._meta.get_field_by_name('sjtu_id')[0].verbose_name, + 'sjtu_initpass': self._meta.get_field_by_name('sjtu_initpass')[0].verbose_name, 'is_approved': self._meta.get_field_by_name('is_approved')[0].verbose_name, 'is_sponsored': self._meta.get_field_by_name('is_sponsored')[0].verbose_name, 'is_checkin': self._meta.get_field_by_name('is_checkin')[0].verbose_name, @@ -229,6 +236,8 @@ class UserProfile(models.Model): 'reason': self.reason, 'transcript': transcript, 'supplement': self.supplement, + 'sjtu_id': self.sjtu_id, + 'sjtu_initpass': self.sjtu_initpass, 'is_approved': self.get_approved_value(), 'is_sponsored': self.get_sponsored_value(), 'is_checkin': self.get_checkin_value(), |