Avatar refactoring

remotes/origin/enhancement/email-actions
Alejandro Alonso 2014-09-29 09:51:17 +02:00
parent fbff7a8b88
commit bfecc26158
4 changed files with 4 additions and 12 deletions

View File

@ -99,7 +99,7 @@ MEDIA_URL = "http://localhost:8000/media/"
# Static url is not widelly used by taiga (only # Static url is not widelly used by taiga (only
# if admin is activated). # if admin is activated).
STATIC_URL = "/static/" STATIC_URL = "http://localhost:8000/static/"
ADMIN_MEDIA_PREFIX = "/static/admin/" ADMIN_MEDIA_PREFIX = "/static/admin/"
# Static configuration. # Static configuration.
@ -309,7 +309,7 @@ SOUTH_MIGRATION_MODULES = {
DEFAULT_AVATAR_SIZE = 80 # 80x80 pixels DEFAULT_AVATAR_SIZE = 80 # 80x80 pixels
DEFAULT_BIG_AVATAR_SIZE = 300 # 300x300 pixels DEFAULT_BIG_AVATAR_SIZE = 300 # 300x300 pixels
DEFAULT_AVATAR_URL = '' DEFAULT_AVATAR_URL = 'user-noimage.png'
THUMBNAIL_ALIASES = { THUMBNAIL_ALIASES = {
'': { '': {
@ -345,4 +345,3 @@ if "test" in sys.argv:
print ("\033[1;91mNo django tests.\033[0m") print ("\033[1;91mNo django tests.\033[0m")
print ("Try: \033[1;33mpy.test\033[0m") print ("Try: \033[1;33mpy.test\033[0m")
sys.exit(0) sys.exit(0)

View File

@ -32,11 +32,6 @@ def mediafiles_urlpatterns():
""" """
Method for serve media files with runserver. Method for serve media files with runserver.
""" """
_media_url = settings.MEDIA_URL
if _media_url.startswith('/'):
_media_url = _media_url[1:]
from django.views.static import serve from django.views.static import serve
return [ return [
url(r'^%s(?P<path>.*)$' % 'media', serve, url(r'^%s(?P<path>.*)$' % 'media', serve,

View File

@ -19,9 +19,7 @@ import hashlib
from urllib.parse import urlencode from urllib.parse import urlencode
from django.conf import settings from django.conf import settings
from django.templatetags.static import static
from taiga.base.utils.urls import get_absolute_url
GRAVATAR_BASE_URL = "//www.gravatar.com/avatar/{}?{}" GRAVATAR_BASE_URL = "//www.gravatar.com/avatar/{}?{}"
@ -39,7 +37,7 @@ def get_gravatar_url(email: str, **options) -> str:
defaults = settings.GRAVATAR_DEFAULT_OPTIONS.copy() defaults = settings.GRAVATAR_DEFAULT_OPTIONS.copy()
default = defaults.get("default", None) default = defaults.get("default", None)
if default: if default:
defaults["default"] = get_absolute_url(default) defaults["default"] = static(default)
defaults.update(options) defaults.update(options)
email_hash = hashlib.md5(email.lower().encode()).hexdigest() email_hash = hashlib.md5(email.lower().encode()).hexdigest()
url = GRAVATAR_BASE_URL.format(email_hash, urlencode(defaults)) url = GRAVATAR_BASE_URL.format(email_hash, urlencode(defaults))

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB