klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-26 19:14:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some mistakes

Browse Source
This commit is contained in:
Antoine Bartuccio 2016-09-21 14:01:44 +02:00
parent 2d16b9c296
commit 748ad1c5c2
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/models.py
View File

@ -234,12 +234,7 @@ class User(AbstractBaseUser):
@property @property
def is_office(self): def is_office(self):
from club.models import Club from club.models import Club
return Club.objects.filter(unix_name='laverie').first().get_membership_for(self) return Club.objects.filter(unix_name='ae').first().get_membership_for(self)
@property
def is_launderette(self):
from club.models import Club
return Club.objects.filter(unix_name='').first().get_membership_for(self)
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
create = False create = False

2
core/templates/core/user_detail.jinja
View File

@ -59,8 +59,6 @@
{% if user == profile or user.is_root or user.is_office %} {% if user == profile or user.is_root or user.is_office %}
{% trans subscription_end=get_subscriber(profile).subscriptions.last().subscription_end %}Subscribed until {{ subscription_end }}{% endtrans %}<br/> {% trans subscription_end=get_subscriber(profile).subscriptions.last().subscription_end %}Subscribed until {{ subscription_end }}{% endtrans %}<br/>
{% trans %}Account number: {% endtrans %}{{ profile.customer.account_id }}<br/> {% trans %}Account number: {% endtrans %}{{ profile.customer.account_id }}<br/>
{% endif %}
{% if user == profile or user.is_root or user.is_office or user.is_launderette %}
{# Shows tokens bought by the user #} {# Shows tokens bought by the user #}
{{ show_tokens(profile) }} {{ show_tokens(profile) }}
{# Shows slots took by the user #} {# Shows slots took by the user #}