From 380f41445ab31a25dbc522a6299c41746ef7d396 Mon Sep 17 00:00:00 2001 From: klmp200 Date: Thu, 22 Sep 2016 13:07:22 +0200 Subject: [PATCH] Modify property names --- core/models.py | 4 ++-- core/templates/core/user_detail.jinja | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/models.py b/core/models.py index c7cee3a9..1a67237a 100644 --- a/core/models.py +++ b/core/models.py @@ -232,12 +232,12 @@ class User(AbstractBaseUser): return self.is_superuser or self.groups.filter(name=settings.SITH_GROUPS['root']['name']).exists() @property - def is_office(self): + def is_board_member(self): from club.models import Club return Club.objects.filter(unix_name=settings.SITH_MAIN_CLUB['unix_name']).first().get_membership_for(self) @property - def is_launderette(self): + def is_launderette_manager(self): from club.models import Club return Club.objects.filter(unix_name=settings.SITH_LAUNDERETTE_MANAGER['unix_name']).first().get_membership_for(self) diff --git a/core/templates/core/user_detail.jinja b/core/templates/core/user_detail.jinja index 8cfca543..800e2b2a 100644 --- a/core/templates/core/user_detail.jinja +++ b/core/templates/core/user_detail.jinja @@ -56,9 +56,11 @@ {# if the user is member of a club, he can view the subscription state #}

{% if get_subscriber(profile).is_subscribed() %} - {% if user == profile or user.is_root or user.is_office %} + {% if user == profile or user.is_root or user.is_board_member %} {% trans subscription_end=get_subscriber(profile).subscriptions.last().subscription_end %}Subscribed until {{ subscription_end }}{% endtrans %}
{% trans %}Account number: {% endtrans %}{{ profile.customer.account_id }}
+ {% endif %} + {% if user == profile or user.is_root or user.is_board_member or user.is_launderette_manager %} {# Shows tokens bought by the user #} {{ show_tokens(profile) }} {# Shows slots took by the user #}