Mise à jour d'avril (#643)

launderette/migrations/0001_initial.py

@@ -6,7 +6,6 @@ import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("subscription", "0001_initial"), ("counter", "0001_initial")]
 
     operations = [

launderette/models.py

@@ -42,6 +42,8 @@ class Launderette(models.Model):
         """
         Method to see if that object can be edited by the given user
         """
+        if user.is_anonymous:
+            return False
         launderette_club = Club.objects.filter(
             unix_name=settings.SITH_LAUNDERETTE_MANAGER["unix_name"]
         ).first()
@@ -60,7 +62,7 @@ class Launderette(models.Model):
         return False
 
     def can_be_viewed_by(self, user):
-        return user.is_in_group(settings.SITH_MAIN_MEMBERS_GROUP)
+        return user.is_subscribed
 
     def __str__(self):
         return self.name
@@ -101,6 +103,8 @@ class Machine(models.Model):
         """
         Method to see if that object can be edited by the given user
         """
+        if user.is_anonymous:
+            return False
         launderette_club = Club.objects.filter(
             unix_name=settings.SITH_LAUNDERETTE_MANAGER["unix_name"]
         ).first()
@@ -155,6 +159,8 @@ class Token(models.Model):
         """
         Method to see if that object can be edited by the given user
         """
+        if user.is_anonymous:
+            return False
         launderette_club = Club.objects.filter(
             unix_name=settings.SITH_LAUNDERETTE_MANAGER["unix_name"]
         ).first()

launderette/templates/launderette/launderette_book_choose.jinja

@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block content %}
-{% if request.user.is_in_group(settings.SITH_MAIN_MEMBERS_GROUP) %}
+{% if request.user.is_subscribed %}
 <ul>
     {% for l in launderette_list  %}
     <li><a href="{{ url('launderette:book_slot', launderette_id=l.id) }}">{{ l }}</a></li>

launderette/templates/launderette/launderette_main.jinja

@@ -8,7 +8,7 @@
 {% if request.user.can_edit(page) %}
 <p><a href="{{ url('core:page_edit', page_name=page.get_full_name()) }}">{% trans %}Edit presentation page{% endtrans %}</a></p>
 {% endif %}
-{% if request.user.is_in_group(settings.SITH_MAIN_MEMBERS_GROUP) %}
+{% if request.user.is_subscribed %}
 <p><a href="{{ url('launderette:book_main') }}">{% trans %}Book launderette slot{% endtrans %}</a></p>
 {% endif %}