From b0d833f32713b5d4804f1ee6d2c36ae99a3a707f Mon Sep 17 00:00:00 2001 From: Zamil Majdy <z.majdy1996@gmail.com> Date: Tue, 21 Mar 2017 09:10:28 +0700 Subject: [PATCH] [#140382397] #8 Add name on user --- core/models/accounts.py | 12 ++++++++++++ core/serializers/accounts.py | 11 ++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/core/models/accounts.py b/core/models/accounts.py index b911474b..d09afa5b 100644 --- a/core/models/accounts.py +++ b/core/models/accounts.py @@ -43,6 +43,10 @@ class Student(models.Model): resume = models.FileField(upload_to=get_file_path, null=True, blank=True) phone_number = models.CharField(max_length=100, blank=True, db_index=True) + @property + def name(self): + return get_display_name(self.user) + def __unicode__(self): return u"Student {}".format(get_display_name(self.user)) @@ -57,6 +61,10 @@ class Company(models.Model): description = models.TextField() verified = models.BooleanField(default=False) + @property + def name(self): + return get_display_name(self.user) + def __unicode__(self): return u"Company {}".format(get_display_name(self.user)) @@ -70,5 +78,9 @@ class Supervisor(models.Model): user = models.OneToOneField(User) nip = models.IntegerField(validators=[MinValueValidator(100000000), MaxValueValidator(9999999999)], unique=True) + @property + def name(self): + return get_display_name(self.user) + def __unicode__(self): return u"Supervisor {}".format(get_display_name(self.user)) diff --git a/core/serializers/accounts.py b/core/serializers/accounts.py index ad3f9aea..b08e5aac 100644 --- a/core/serializers/accounts.py +++ b/core/serializers/accounts.py @@ -11,18 +11,27 @@ class UserSerializer(serializers.HyperlinkedModelSerializer): class StudentSerializer(serializers.ModelSerializer): + user = UserSerializer() + name = serializers.ReadOnlyField() + class Meta: model = Student fields = '__all__' class CompanySerializer(serializers.ModelSerializer): + user = UserSerializer() + name = serializers.ReadOnlyField() + class Meta: model = Company fields = '__all__' class SupervisorSerializer(serializers.ModelSerializer): + user = UserSerializer() + name = serializers.ReadOnlyField() + class Meta: model = Supervisor - fields = '__all__' \ No newline at end of file + fields = '__all__' -- GitLab