mirror of
				https://github.com/ae-utbm/sith.git
				synced 2025-10-31 17:13:08 +00:00 
			
		
		
		
	Hided launderette slots and tokens for non authorized users and added is_office and is_launderette
This commit is contained in:
		| @@ -231,6 +231,16 @@ class User(AbstractBaseUser): | |||||||
|     def is_root(self): |     def is_root(self): | ||||||
|         return self.is_superuser or self.groups.filter(name=settings.SITH_GROUPS['root']['name']).exists() |         return self.is_superuser or self.groups.filter(name=settings.SITH_GROUPS['root']['name']).exists() | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def is_office(self): | ||||||
|  |         from club.models import Club | ||||||
|  |         return Club.objects.filter(unix_name='laverie').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 | ||||||
|         with transaction.atomic(): |         with transaction.atomic(): | ||||||
|   | |||||||
| @@ -56,14 +56,16 @@ | |||||||
| {# if the user is member of a club, he can view the subscription state #} | {# if the user is member of a club, he can view the subscription state #} | ||||||
| <p> | <p> | ||||||
| {% if get_subscriber(profile).is_subscribed() %} | {% if get_subscriber(profile).is_subscribed() %} | ||||||
|     {% trans subscription_end=get_subscriber(profile).subscriptions.last().subscription_end %}Subscribed until {{ subscription_end }}{% endtrans %}<br/> |     {% if user == profile or user.is_root or user.is_office %} | ||||||
|     {% if user == profile or user.is_root %} |         {% 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 #} | ||||||
|  |         {{ show_tokens(profile) }} | ||||||
|  |         {# Shows slots took by the user #} | ||||||
|  |         {{ show_slots(profile) }} | ||||||
|     {% endif %} |     {% endif %} | ||||||
|     {# Shows tokens bought by the user #} |  | ||||||
|     {{ show_tokens(profile) }} |  | ||||||
|     {# Shows slots took by the user #} |  | ||||||
|     {{ show_slots(profile) }} |  | ||||||
| {% else %} | {% else %} | ||||||
|     {% trans %}Not subscribed{% endtrans %} |     {% trans %}Not subscribed{% endtrans %} | ||||||
|     {% if user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) %} |     {% if user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) %} | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user