mirror of
https://github.com/ae-utbm/sith.git
synced 2024-11-25 02:24:26 +00:00
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:
parent
18a5ad6541
commit
21fc85670e
@ -415,11 +415,14 @@ class User(AbstractBaseUser):
|
|||||||
)
|
)
|
||||||
|
|
||||||
@cached_property
|
@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
|
from club.models import Club
|
||||||
|
|
||||||
for club in Club.objects.filter(
|
for club in Club.objects.filter(
|
||||||
id__in=settings.SITH_CAN_READ_SUBSCRIPTIONS
|
id__in=settings.SITH_CAN_READ_SUBSCRIPTION_HISTORY
|
||||||
).all():
|
).all():
|
||||||
if club.has_rights_in_club(self):
|
if club.has_rights_in_club(self):
|
||||||
return True
|
return True
|
||||||
@ -703,7 +706,7 @@ class AnonymousUser(AuthAnonymousUser):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def can_read_subscription(self):
|
def can_read_subscription_history(self):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -145,7 +145,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% 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">
|
<div id="drop_subscriptions">
|
||||||
<h5>{% trans %}Subscription history{% endtrans %}</h5>
|
<h5>{% trans %}Subscription history{% endtrans %}</h5>
|
||||||
<table>
|
<table>
|
||||||
|
@ -472,9 +472,13 @@ SITH_PRODUCT_SUBSCRIPTION_ONE_SEMESTER = 1
|
|||||||
SITH_PRODUCT_SUBSCRIPTION_TWO_SEMESTERS = 2
|
SITH_PRODUCT_SUBSCRIPTION_TWO_SEMESTERS = 2
|
||||||
SITH_PRODUCTTYPE_SUBSCRIPTION = 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_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
|
# Number of weeks before the end of a subscription when the subscriber can resubscribe
|
||||||
SITH_SUBSCRIPTION_END = 10
|
SITH_SUBSCRIPTION_END = 10
|
||||||
|
Loading…
Reference in New Issue
Block a user