hot fix: Updated variable names & comments (#461)

- Fixed a wrong condition on the users subscribing history `read` permission.
- The comments are clearer and mentions how to specify clubs by their id.
This commit is contained in:
Théo DURR 2022-08-31 20:53:08 +02:00 committed by GitHub
parent 18a5ad6541
commit 21fc85670e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions

View File

@ -415,11 +415,14 @@ class User(AbstractBaseUser):
)
@cached_property
def can_read_subscription(self):
def can_read_subscription_history(self):
if self.is_root or self.is_board_member:
return True
from club.models import Club
for club in Club.objects.filter(
id__in=settings.SITH_CAN_READ_SUBSCRIPTIONS
id__in=settings.SITH_CAN_READ_SUBSCRIPTION_HISTORY
).all():
if club.has_rights_in_club(self):
return True
@ -703,7 +706,7 @@ class AnonymousUser(AuthAnonymousUser):
return False
@property
def can_read_subscription(self):
def can_read_subscription_history(self):
return False
@property

View File

@ -145,7 +145,7 @@
{% endif %}
</div>
{% endif %}
{% if profile.was_subscribed and (user == profile or user.is_root or user.is_board_member or user.can_read_subscription)%}
{% if profile.was_subscribed and (user == profile or user.can_read_subscription_history)%}
<div id="drop_subscriptions">
<h5>{% trans %}Subscription history{% endtrans %}</h5>
<table>

View File

@ -472,9 +472,13 @@ SITH_PRODUCT_SUBSCRIPTION_ONE_SEMESTER = 1
SITH_PRODUCT_SUBSCRIPTION_TWO_SEMESTERS = 2
SITH_PRODUCTTYPE_SUBSCRIPTION = 2
# Defines which club lets its member the ability to make subscriptions
# Elements of this list are club's id
SITH_CAN_CREATE_SUBSCRIPTIONS = [1]
SITH_CAN_READ_SUBSCRIPTIONS = [85]
# Defines which clubs lets its members the ability to see users subscription history
# Elements of this list are club's id
SITH_CAN_READ_SUBSCRIPTION_HISTORY = []
# Number of weeks before the end of a subscription when the subscriber can resubscribe
SITH_SUBSCRIPTION_END = 10