From 768a2eda24f697321583c0a53b7c6dd0ebadfccd Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Thu, 1 Sep 2022 21:12:05 +0200 Subject: [PATCH] clarify CC function in WPD and PCM --- files/classes/user.py | 2 +- files/helpers/jinja2.py | 12 ++++++------ files/templates/submit.html | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/files/classes/user.py b/files/classes/user.py index 8473911e4..380849b99 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -305,7 +305,7 @@ class User(Base): def paid_dues(self): if not FEATURES['COUNTRY_CLUB']: return True - return not self.shadowbanned and not (self.is_banned and not self.unban_utc) and (self.admin_level or self.club_allowed or (self.club_allowed != False and self.truecoins > dues)) + return not self.shadowbanned and not (self.is_banned and not self.unban_utc) and (self.admin_level or self.club_allowed or (self.club_allowed != False and self.truecoins >= dues)) @lazy def any_block_exists(self, other): diff --git a/files/helpers/jinja2.py b/files/helpers/jinja2.py index d1b5e0aab..f599959af 100644 --- a/files/helpers/jinja2.py +++ b/files/helpers/jinja2.py @@ -53,9 +53,9 @@ def inject_constants(): "AUTOJANNY_ID":AUTOJANNY_ID, "PUSHER_ID":PUSHER_ID, "CC":CC, "CC_TITLE":CC_TITLE, "listdir":listdir, "MOOSE_ID":MOOSE_ID, "AEVANN_ID":AEVANN_ID, "PIZZASHILL_ID":PIZZASHILL_ID, "DEFAULT_COLOR":DEFAULT_COLOR, - "COLORS":COLORS, "time":time, "PERMS": PERMS, "FEATURES": FEATURES, - "HOLE_NAME": HOLE_NAME, "HOLE_STYLE_FLAIR": HOLE_STYLE_FLAIR, "HOLE_REQUIRED": HOLE_REQUIRED, - "LOTTERY_ENABLED": LOTTERY_ENABLED, "GUMROAD_LINK": GUMROAD_LINK, - "DEFAULT_THEME": DEFAULT_THEME, "DESCRIPTION": DESCRIPTION, - "has_sidebar": has_sidebar, "has_logo": has_logo, "has_app": has_app, - "FP": FP, "NOTIF_MODACTION_JL_MIN": NOTIF_MODACTION_JL_MIN, "cache": cache, "ONLINE_STR": ONLINE_STR, "patron": patron, "approved_embed_hosts": approved_embed_hosts} + "COLORS":COLORS, "time":time, "PERMS":PERMS, "FEATURES":FEATURES, + "HOLE_NAME":HOLE_NAME, "HOLE_STYLE_FLAIR":HOLE_STYLE_FLAIR, "HOLE_REQUIRED":HOLE_REQUIRED, + "LOTTERY_ENABLED":LOTTERY_ENABLED, "GUMROAD_LINK":GUMROAD_LINK, + "DEFAULT_THEME":DEFAULT_THEME, "DESCRIPTION":DESCRIPTION, + "has_sidebar":has_sidebar, "has_logo":has_logo, "has_app":has_app, + "FP":FP, "NOTIF_MODACTION_JL_MIN":NOTIF_MODACTION_JL_MIN, "cache":cache, "ONLINE_STR":ONLINE_STR, "patron":patron, "approved_embed_hosts":approved_embed_hosts, "dues":dues} diff --git a/files/templates/submit.html b/files/templates/submit.html index 8efa49f5e..211946665 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -181,7 +181,7 @@ {% if FEATURES['COUNTRY_CLUB'] -%}
- +
{%- endif %}