# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1462317505 -7200
# Node ID 8d01c8a72bb58095cc692160167d7832a89f15e7
# Parent  7a7b817aa156cf1c4d3b07e44c32221a00679f2b
helpers: refactor handling of default gravatars - use explicit 'default' instead of empty string

diff -r 7a7b817aa156 -r 8d01c8a72bb5 kallithea/lib/helpers.py
--- a/kallithea/lib/helpers.py	Wed May 04 01:18:25 2016 +0200
+++ b/kallithea/lib/helpers.py	Wed May 04 01:18:25 2016 +0200
@@ -862,7 +862,7 @@
 
     return literal(html)
 
-def gravatar_url(email_address, size=30):
+def gravatar_url(email_address, size=30, default=''):
     # doh, we need to re-import those to mock it later
     from pylons import url
     from pylons import tmpl_context as c
@@ -873,7 +873,7 @@
     email_address = email_address or _def
 
     if email_address == _def:
-        return ""
+        return default
 
     parsed_url = urlparse.urlparse(url.current(qualified=True))
     url = (c.visual.gravatar_url or User.DEFAULT_GRAVATAR_URL ) \
diff -r 7a7b817aa156 -r 8d01c8a72bb5 kallithea/model/repo.py
--- a/kallithea/model/repo.py	Wed May 04 01:18:25 2016 +0200
+++ b/kallithea/model/repo.py	Wed May 04 01:18:25 2016 +0200
@@ -142,7 +142,7 @@
                 'fname': h.escape(u.name),
                 'lname': h.escape(u.lastname),
                 'nname': u.username,
-                'gravatar_lnk': h.gravatar_url(u.email, size=28),
+                'gravatar_lnk': h.gravatar_url(u.email, size=28, default='default'),
                 'gravatar_size': 14,
             } for u in users]
         )
diff -r 7a7b817aa156 -r 8d01c8a72bb5 kallithea/public/js/base.js
--- a/kallithea/public/js/base.js	Wed May 04 01:18:25 2016 +0200
+++ b/kallithea/public/js/base.js	Wed May 04 01:18:25 2016 +0200
@@ -1076,8 +1076,9 @@
         + "</span>" + full.substring(matchindex + snippet.length);
 };
 
+// Return html snippet for showing the provided gravatar url
 var gravatar = function(gravatar_lnk, size, cssclass) {
-    if (!gravatar_lnk) {
+    if (!gravatar_lnk || gravatar_lnk == 'default') {
         return '<i class="icon-user {1}" style="font-size: {0}px;"></i>'.format(size, cssclass);
     }
     return '<img alt="" class="{2}" style="width: {0}px; height: {0}px" src="{1}"/>'.format(size, gravatar_lnk, cssclass);
diff -r 7a7b817aa156 -r 8d01c8a72bb5 kallithea/templates/pullrequests/pullrequest_show.html
--- a/kallithea/templates/pullrequests/pullrequest_show.html	Wed May 04 01:18:25 2016 +0200
+++ b/kallithea/templates/pullrequests/pullrequest_show.html	Wed May 04 01:18:25 2016 +0200
@@ -279,7 +279,7 @@
                   fname="${u.name}"
                   lname="${u.lastname}"
                   nname="${u.username}"
-                  gravatar_lnk="${h.gravatar_url(u.email, size=28)}"
+                  gravatar_lnk="${h.gravatar_url(u.email, size=28, default='default')}"
                   gravatar_size="14"
                   title="Click to add reviewer to the list, then Save Changes.">${u.full_name}</a>
               </li>