diff --git a/app/admin_model.py b/app/admin_model.py index a49efc23..3f1881ae 100644 --- a/app/admin_model.py +++ b/app/admin_model.py @@ -93,6 +93,10 @@ class SLAdminIndexView(AdminIndexView): return redirect("/admin/user") +def _user_upgrade_channel_formatter(view, context, model, name): + return Markup(model.upgrade_channel) + + class UserAdmin(SLModelView): column_searchable_list = ["email", "id"] column_exclude_list = [ @@ -110,6 +114,10 @@ class UserAdmin(SLModelView): ret.insert(0, "upgrade_channel") return ret + column_formatters = { + "upgrade_channel": _user_upgrade_channel_formatter, + } + @action( "education_upgrade", "Education upgrade", diff --git a/app/models.py b/app/models.py index f0b3248f..0edcb858 100644 --- a/app/models.py +++ b/app/models.py @@ -720,11 +720,11 @@ class User(Base, ModelMixin, UserMixin, PasswordOracle): if sub: if sub.cancelled: channels.append( - f"Cancelled Paddle Subscription {sub.subscription_id} {sub.plan_name()} ends at {sub.next_bill_date}" + f"""Cancelled Paddle Subscription {sub.subscription_id} {sub.plan_name()} ends at {sub.next_bill_date}""" ) else: channels.append( - f"Active Paddle Subscription {sub.subscription_id} {sub.plan_name()}, renews at {sub.next_bill_date}" + f"""Active Paddle Subscription {sub.subscription_id} {sub.plan_name()}, renews at {sub.next_bill_date}""" ) apple_sub: AppleSubscription = AppleSubscription.get_by(user_id=self.id)