Actually deliver a default avatar when none was uploaded

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 3c5a1a7e17a777e8c70088011a22d081166b0356..a6a7a264c6bd3705457a485a9d064b447dcbfe5b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -220,6 +220,7 @@ static_images_DATA = \
        src/static/img/amex@2x.png \
        src/static/img/amex@3x.png \
        src/static/img/appliance-pro.png \
+       src/static/img/default-avatar.jpg \
        src/static/img/ipfire-tux.png \
        src/static/img/lightningwirelabs-logo.svg \
        src/static/img/mastercard.png \

diff --git a/src/static/img/default-avatar.jpg b/src/static/img/default-avatar.jpg
new file mode 100644 (file)
index 0000000..07ffd9f
Binary files /dev/null and b/src/static/img/default-avatar.jpg differ

diff --git a/src/web/handlers_accounts.py b/src/web/handlers_accounts.py
index bbf113e2a7f022921e8dfdfd5f7d1b21f252c09d..1560eee6e2aab059c532fab65a07eed51e8695fa 100644 (file)
--- a/src/web/handlers_accounts.py
+++ b/src/web/handlers_accounts.py
@@ -30,7 +30,7 @@ class AccountsAvatarHandler(base.BaseHandler):
 
                # If there is no avatar, we serve a default image
                if not avatar:
-                       raise tornado.web.HTTPError(404, "No avatar set for %s" % account)
+                       return self.redirect("https://static.ipfire.org%s" % self.static_url("img/default-avatar.jpg"))
 
                # Set headers about content
                self.set_header("Content-Disposition", "inline; filename=\"%s.jpg\"" % who)