From d305f5103f4e37f4f518251420215bf895a872dd Mon Sep 17 00:00:00 2001 From: "Bradley M. Kuhn" Date: Mon, 30 Nov 2015 20:32:57 -0800 Subject: [PATCH] Implement min filter. --- www/conservancy/apps/news/templatetags/min.py | 8 ++++++++ www/conservancy/templates/base_conservancy.html | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 www/conservancy/apps/news/templatetags/min.py diff --git a/www/conservancy/apps/news/templatetags/min.py b/www/conservancy/apps/news/templatetags/min.py new file mode 100644 index 00000000..f54c4616 --- /dev/null +++ b/www/conservancy/apps/news/templatetags/min.py @@ -0,0 +1,8 @@ +from django import template +register = template.Library() + +@register.filter +def min(value, arg): + if value > arg: + return arg + return value diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html index 396a5fb2..acecb88d 100644 --- a/www/conservancy/templates/base_conservancy.html +++ b/www/conservancy/templates/base_conservancy.html @@ -1,5 +1,7 @@ {% load humanize %} {% load subtract %} +{% load min %} + @@ -55,8 +57,7 @@
{{ sitefundgoal.fundraiser_so_far_amount|intcomma }} have joined so far {% if sitefundgoal.fundraiser_donation_count_disclose_threshold > 0 %} -{% if sitefundgoal.fundraiser_donation_count_disclose_threshold < 83 %} - and match pledges reduced our 2,500 maximum need by {{ sitefundgoal.fundraiser_donation_count_disclose_threshold|intcomma }} + and match pledges reduced our 2,500 maximum need by {{ sitefundgoal.fundraiser_donation_count_disclose_threshold|min:83|intcomma }} {% endif %} {% endif %} !