From 161de00bfaaf63738dfbda3a83bf1fa0ee4729f0 Mon Sep 17 00:00:00 2001 From: "byte[]" Date: Mon, 11 Nov 2019 20:40:31 -0500 Subject: [PATCH] fix award titles --- lib/philomena_web/templates/profile/show.html.slime | 2 +- lib/philomena_web/views/profile_view.ex | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/philomena_web/templates/profile/show.html.slime b/lib/philomena_web/templates/profile/show.html.slime index 903138bd..c42a8df9 100644 --- a/lib/philomena_web/templates/profile/show.html.slime +++ b/lib/philomena_web/templates/profile/show.html.slime @@ -46,7 +46,7 @@ .flex__grow.center .badge = badge_image(award.badge, alt: award.label, width: "32", height: "32") br - = (award.badge_name || award.badge.title) + = award_title(award) .flex__grow.center = pretty_time(award.awarded_on) diff --git a/lib/philomena_web/views/profile_view.ex b/lib/philomena_web/views/profile_view.ex index 7d37514d..1b530ed5 100644 --- a/lib/philomena_web/views/profile_view.ex +++ b/lib/philomena_web/views/profile_view.ex @@ -10,6 +10,13 @@ defmodule PhilomenaWeb.ProfileView do img_tag(badge_url_root() <> "/" <> badge.image, options) end + def award_title(%{badge_name: nil} = award), + do: award.badge.title + def award_title(%{badge_name: ""} = award), + do: award.badge.title + def award_title(award), + do: award.badge_name + defp badge_url_root do Application.get_env(:philomena, :badge_url_root) end