fergalmoran/dss.api
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.api.git synced 2025-12-27 11:48:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made avatar images local again

Browse Source
This commit is contained in:
Fergal Moran
2015-08-03 20:53:07 +01:00
parent bacb9b5e2e
commit 967f0d0d2a
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spa/models/userprofile.py
View File

@@ -168,7 +168,6 @@ class UserProfile(BaseModel):
return self.display_name or self.first_name + ' ' + self.last_name
def get_sized_avatar_image(self, width, height):
return self.get_avatar_image()
try:
image = self.get_avatar_image()
sized = thumbnail.get_thumbnail(image, "%sx%s" % (width, height), crop="center")
@@ -179,7 +178,18 @@ class UserProfile(BaseModel):
return UserProfile.get_default_avatar_image()
def get_avatar_image(self):
return (settings.CDN_URL + 'avatars/{0}').format(self.id)
avatar_type = self.avatar_type
if avatar_type == 'gravatar':
gravatar_exists = has_gravatar(self.email)
if gravatar_exists:
return get_gravatar_url(self.email)
else:
if os.path.exists(self.avatar_image.file.name):
return self.avatar_image
else:
return self.get_default_avatar_image()
return UserProfile.get_default_avatar_image()
def get_profile_url(self):
return '/user/%s' % (self.slug)