From bfecc26158359c851840bccd2c4f8605c1a766da Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandro.alonso@kaleidos.net>
Date: Mon, 29 Sep 2014 09:51:17 +0200
Subject: [PATCH] Avatar refactoring

---
 settings/common.py                      |   5 ++---
 taiga/urls.py                           |   5 -----
 taiga/users/gravatar.py                 |   6 ++----
 taiga/users/static/img/user-noimage.png | Bin 0 -> 1445 bytes
 4 files changed, 4 insertions(+), 12 deletions(-)
 create mode 100644 taiga/users/static/img/user-noimage.png

diff --git a/settings/common.py b/settings/common.py
index d3ac205e..7d5f11b0 100644
--- a/settings/common.py
+++ b/settings/common.py
@@ -99,7 +99,7 @@ MEDIA_URL = "http://localhost:8000/media/"
 
 # Static url is not widelly used by taiga (only
 # if admin is activated).
-STATIC_URL = "/static/"
+STATIC_URL = "http://localhost:8000/static/"
 ADMIN_MEDIA_PREFIX = "/static/admin/"
 
 # Static configuration.
@@ -309,7 +309,7 @@ SOUTH_MIGRATION_MODULES = {
 DEFAULT_AVATAR_SIZE = 80                # 80x80 pixels
 DEFAULT_BIG_AVATAR_SIZE = 300           # 300x300 pixels
 
-DEFAULT_AVATAR_URL = ''
+DEFAULT_AVATAR_URL = 'user-noimage.png'
 
 THUMBNAIL_ALIASES = {
     '': {
@@ -345,4 +345,3 @@ if "test" in sys.argv:
     print ("\033[1;91mNo django tests.\033[0m")
     print ("Try: \033[1;33mpy.test\033[0m")
     sys.exit(0)
-
diff --git a/taiga/urls.py b/taiga/urls.py
index f9ee53c4..aba8f1ba 100644
--- a/taiga/urls.py
+++ b/taiga/urls.py
@@ -32,11 +32,6 @@ def mediafiles_urlpatterns():
     """
     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
     return [
         url(r'^%s(?P<path>.*)$' % 'media', serve,
diff --git a/taiga/users/gravatar.py b/taiga/users/gravatar.py
index ed5a8a33..fc3a8661 100644
--- a/taiga/users/gravatar.py
+++ b/taiga/users/gravatar.py
@@ -19,9 +19,7 @@ import hashlib
 from urllib.parse import urlencode
 
 from django.conf import settings
-
-from taiga.base.utils.urls import get_absolute_url
-
+from django.templatetags.static import static
 
 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()
     default = defaults.get("default", None)
     if default:
-        defaults["default"] = get_absolute_url(default)
+        defaults["default"] = static(default)
     defaults.update(options)
     email_hash = hashlib.md5(email.lower().encode()).hexdigest()
     url = GRAVATAR_BASE_URL.format(email_hash, urlencode(defaults))
diff --git a/taiga/users/static/img/user-noimage.png b/taiga/users/static/img/user-noimage.png
new file mode 100644
index 0000000000000000000000000000000000000000..48ae7feb8c972754ce46b78f3e8959558c634b01
GIT binary patch
literal 1445
zcmZXUdpOez7{`AYExE1sgbXuvtVnYTIj+;@o=s@=&_PR1MswUIre!XTLyC1y9z-OG
z9Cac!*1;~vB|79XV^i+OTqZ>>a~^+G&U60w{`3CvzR&mj{XB0v-qTrCd7m->0IIGo
zm{R}%By9<-1OUKfu>cPM04U1Q)dvg)gQ?&P3;+OjM!1}f0sz(iEy+0|^Wy*j(2mBQ
ziS{O6jHU!d1_Kld#q`o;QWP;LBG{B18InI|vkw3i5v~}tPh7$5F!?9n7#Lr=JTDsF
zkb0hr+8mOo3zKCgEu32)&MILUT8e3)^Y?E<P4Fcs<9m8qwnsQ{<P<sx30CY)Hh|D?
zB8=Tnwe<B}?EJJWvzlBA#4;&!<%Qy_)|4X6zj$*3tAMdt+mK0FtoaVlsv9>I5057R
zQXGVV(7?ix@^Xi$>Vc%hcD+MAwQPRPuj;&&(2<j3;u%*DP?j&{l(*Mpf(j{@3lSTh
z>6vzbCL!g~5O9VA9z;iIK$D8Wpsg+6M!TQg9T}^z^T3ZMsE}R+W)>;&3TJ7TPNW65
z8xsYD^N4|lU?YX(6Kwt+OTB?^&M1q(dHOr2KrPdZ?TqxxaM%q+yFu!63cyPqBOd2X
zRm7rAWp0Hae^y^>gloIzX7_1vPVcFps#hwqU9r=oO~3kQrptZ}N@DeOtZuXzCO6c~
ze9XxX9~8I^E|O*K*=hCP`_~9pln#7HzpnpM9NPLhPrtKMtEp2L*WEpIA*R95+1^;Y
zX|UQn>}ps~m6*oflw?9|>TA<I%7$|nq+Lg>v*Bjt3O_r4$!we3Xg*3!pBA4|=Dyc2
z-1-=`RR9yiHVUIthe-x|2=XCO>)~i@%}f~~F&p@E2YFqRkV5<WYmC8hK?8$>&DZA}
zN5eLUmtV7sLB$p<Mi%Y}#lm^bjm0&yXfvgAYim#cV&~s}QS*sZn*!mumMeIHO16S$
zzDqT@wsY5=h_+TXpWePSNh^q9QBm*4R!o^8peE3CLB8fSr^xc-7LjjS*@@o{Z|@Ja
zg#{H>|A!PZ7fO8_zjh#RT#MLWmF~zGGU+wNSn-mLPYcy<6g^mO_Vb)z<USYjYJCsC
z^?j}&Z7>-1Zv|qs^SKB)G?QZMX=3v#Ht^arF{D7c2ue5+eG;DGu$>Y!k<rwTQrK$&
zYiEfK7lqRpN2Ym0Tc)#9BXZy!xXpBBlgeqv%$r4f?q0NaT`o^zyB_tyXtm3k0ZuPL
zctLkV@NCPB2g5#z#<;3=PN)#2yz+jCq>@FOk9$<frSeg)m$G`hRRTK#ikOYZ4tn!T
zIwa&aRXjNDp^LBe-HK;V{Uhz{{R3ui@r4~PQBW*A!@*_2yh$e7$eeI0)FZac>P)fA
zgwtjd$sDJMsU?FnqqIW3(o!}NjVbO)Ldtu6K|ckw$*6B6S?@{B6KhU2kMDxX<`y!u
z`+MI$`6znaZ^L`k=WA&bkh9-{u6xe9`g7d;3lYf)AK;DadU>~=@3y~C4YS1*G)aR9
z;+ZhaiJe-b<i_AIh)<bBR%vzcakI~7>(~aCab)7FoWch~1eg&z45D)5lUIIdok-+!
zA5{_BW=WUF<o5aLjFRtN3WNB=tUAMQ&s06f5eV<4+7W7)6fWW&bC`A8Ly@*1j4K+=
zb90yIwqO`=<yl$k^&kh0)hh`)8w})si`q^I7S5DbGQ!=319kDj%xudGIun=gT&WH-
zoO(DPIKSG+=DUEtTKV5c*s4EengChmJ}IRh7e!u`4CvMgEkk|~{`MyJ=-B(?>kY>s
r{`*#9B*LQ>!o8&xHVd_*x7=3u<k;%P<K;}400024SWir~V<7!sf47#*

literal 0
HcmV?d00001