Change is_subscriber and was_subscriber to cached_properties

core/models.py

@@ -184,9 +184,11 @@ class User(AbstractBaseUser):
     def to_dict(self):
         return self.__dict__
 
+    @cached_property
     def was_subscribed(self):
         return self.subscriptions.exists()
 
+    @cached_property
     def is_subscribed(self):
         s = self.subscriptions.last()
         return s.is_valid_now() if s is not None else False
@@ -207,11 +209,11 @@ class User(AbstractBaseUser):
         if group_id == settings.SITH_GROUP_PUBLIC_ID:
             return True
         if group_id == settings.SITH_GROUP_SUBSCRIBERS_ID:
-            return self.is_subscribed()
+            return self.is_subscribed
         if group_id == settings.SITH_GROUP_OLD_SUBSCRIBERS_ID:
-            return self.was_subscribed()
+            return self.was_subscribed
         if group_name == settings.SITH_MAIN_MEMBERS_GROUP: # We check the subscription if asked
-            return self.is_subscribed()
+            return self.is_subscribed
         if group_name[-len(settings.SITH_BOARD_SUFFIX):] == settings.SITH_BOARD_SUFFIX:
             from club.models import Club
             name = group_name[:-len(settings.SITH_BOARD_SUFFIX)]

core/templates/core/user_detail.jinja

@@ -54,7 +54,7 @@
 {% if user.memberships.filter(end_date=None).exists() or user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user == profile %}
 {# if the user is member of a club, he can view the subscription state #}
 <p>
-{% if profile.is_subscribed() %}
+{% if profile.is_subscribed %}
     {% if user == profile or user.is_root or user.is_board_member %}
         {{ user_subscription(profile) }}
     {% endif %}

core/templates/core/user_tools.jinja

@@ -91,7 +91,7 @@
 <h4>{% trans %}Elections{% endtrans %}</h4>
 <ul>
     <li><a href="{{ url('election:list') }}">{% trans %}See available elections{% endtrans %}</a></li>
-    {%- if user.is_subscribed() -%}
+    {%- if user.is_subscribed -%}
     <li><a href="{{ url('election:create') }}">{% trans %}Create a new election{% endtrans %}</a></li>
     {%- endif -%}
 </ul>