Commit 925bc682 by attiyaishaque Committed by Attiya Ishaque

Fix Instructor images that can be changed.

parent de1ec5c8
...@@ -1138,7 +1138,7 @@ class PersonSerializerTests(TestCase): ...@@ -1138,7 +1138,7 @@ class PersonSerializerTests(TestCase):
'family_name': self.person.family_name, 'family_name': self.person.family_name,
'bio': self.person.bio, 'bio': self.person.bio,
'profile_image': image_field.to_representation(self.person.profile_image), 'profile_image': image_field.to_representation(self.person.profile_image),
'profile_image_url': self.person.profile_image_url, 'profile_image_url': self.person.profile_image.url,
'position': PositionSerializer(position).data, 'position': PositionSerializer(position).data,
'works': [work.value for work in self.person.person_works.all()], 'works': [work.value for work in self.person.person_works.all()],
'urls': { 'urls': {
......
...@@ -298,12 +298,10 @@ class Person(TimeStampedModel): ...@@ -298,12 +298,10 @@ class Person(TimeStampedModel):
@property @property
def get_profile_image_url(self): def get_profile_image_url(self):
url = self.profile_image_url if self.profile_image and hasattr(self.profile_image, 'url'):
if not url: return self.profile_image.url
if self.profile_image and hasattr(self.profile_image, 'url'): else:
url = self.profile_image.url return self.profile_image_url
return url
class Position(TimeStampedModel): class Position(TimeStampedModel):
......
...@@ -434,12 +434,16 @@ class PersonTests(TestCase): ...@@ -434,12 +434,16 @@ class PersonTests(TestCase):
Verify that property returns profile_image_url if profile_image_url Verify that property returns profile_image_url if profile_image_url
exists other wise it returns uploaded image url. exists other wise it returns uploaded image url.
""" """
self.assertEqual(self.person.get_profile_image_url, self.person.profile_image_url) self.assertEqual(self.person.get_profile_image_url, self.person.profile_image.url)
# create another person with out profile_image_url # create another person with out profile_image_url
person = factories.PersonFactory(profile_image_url=None) person = factories.PersonFactory(profile_image_url=None)
self.assertEqual(person.get_profile_image_url, person.profile_image.url) self.assertEqual(person.get_profile_image_url, person.profile_image.url)
# create another person with out profile_image
person = factories.PersonFactory(profile_image=None)
self.assertEqual(person.get_profile_image_url, person.profile_image_url)
# create another person with out profile_image_url and profile_image # create another person with out profile_image_url and profile_image
person = factories.PersonFactory(profile_image_url=None, profile_image=None) person = factories.PersonFactory(profile_image_url=None, profile_image=None)
self.assertFalse(person.get_profile_image_url) self.assertFalse(person.get_profile_image_url)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment