kallithea Changeset - 8d01c8a72bb5

Changeset - 8d01c8a72bb5

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 10 years ago 2016-05-04 01:18:25
madski@unity3d.com

helpers: refactor handling of default gravatars - use explicit 'default' instead of empty string

4 files changed with 6 insertions and 5 deletions:

kallithea/lib/helpers.py

kallithea/model/repo.py

kallithea/public/js/base.js

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -859,24 +859,24 @@ def gravatar(email_address, cls='', size @@
         # if src is empty then there was no gravatar, so we use a font icon
         html = ("""<i class="icon-user {cls}" style="font-size: {size}px;"></i>"""
             .format(cls=cls, size=size, src=src))
     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
     if not c.visual.use_gravatar:
         return ""
     _def = 'anonymous@kallithea-scm.org'  # default gravatar
     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 ) \
                .replace('{email}', email_address) \
                .replace('{md5email}', hashlib.md5(safe_str(email_address).lower()).hexdigest()) \
                .replace('{netloc}', parsed_url.netloc) \

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -139,13 +139,13 @@ class RepoModel(BaseModel): @@
         return json.dumps([
+            {
                 'id': u.user_id,
                 '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]
+        )
     def get_user_groups_js(self):
         user_groups = self.sa.query(UserGroup) \

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -1073,14 +1073,15 @@ var autocompleteHighlightMatch = functio @@
     return full.substring(0, matchindex)
         + "<span class='match'>"
         + full.substr(matchindex, snippet.length)
         + "</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);
+}
 var autocompleteGravatar = function(res, gravatar_lnk, size, group) {

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -276,13 +276,13 @@ ${self.repo_context_bar('showpullrequest @@
               <li>
                 <a class="missing_reviewer missing_reviewer_${u.user_id}"
                   user_id="${u.user_id}"
                   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>
             %endfor
           </ul>
         </div>

0 comments (0 inline, 0 general)