From c740fe4046dce8621fcf98a4eab0d671f6e47f5e Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 11 Oct 2018 12:06:33 +0100 Subject: [PATCH] Actually deliver a default avatar when none was uploaded Signed-off-by: Michael Tremer --- Makefile.am | 1 + src/static/img/default-avatar.jpg | Bin 0 -> 8016 bytes src/web/handlers_accounts.py | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 src/static/img/default-avatar.jpg diff --git a/Makefile.am b/Makefile.am index 3c5a1a7e..a6a7a264 100644 --- 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 index 0000000000000000000000000000000000000000..07ffd9fc8b65337a98a6f44fb51ade17fd5495c6 GIT binary patch literal 8016 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 literal 0 Hc-jL100001 diff --git a/src/web/handlers_accounts.py b/src/web/handlers_accounts.py index bbf113e2..1560eee6 100644 --- 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) -- 2.47.3