Update production

amelie/activities/forms.py

@@ -55,7 +55,7 @@ class Meta:
         model = Activity
         fields = (
             'summary_nl', 'summary_en', 'location', 'begin', 'end', 'organizer', 'activity_label', 'promo_nl', 'promo_en',
-            'description_nl', 'description_en', "public", 'dutch_activity', "enrollment",
+            'description_nl', 'description_en', "public", 'dutch_activity', "enrollment", "enrollment_private",
             "can_unenroll", "enrollment_begin", "enrollment_end", 'maximum', "waiting_list_locked", "price",
             "image_icon", 'callback_url', 'callback_secret_key', 'facebook_event_id', 'oauth_application'
         )

amelie/activities/migrations/0013_activity_enrollment_private.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.2.15 on 2026-07-04 19:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('activities', '0012_alter_activity_price_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='activity',
+            name='enrollment_private',
+            field=models.BooleanField(default=True, verbose_name='Hide participants'),
+        ),
+        migrations.AlterField(
+            model_name='activity',
+            name='enrollment_private',
+            field=models.BooleanField(default=False, verbose_name='Hide participants'),
+        ),
+    ]

amelie/activities/models.py

@@ -57,6 +57,7 @@ class Activity(Event):
     enrollment = models.BooleanField(default=False, verbose_name=_l('enrollment'))
     enrollment_begin = models.DateTimeField(blank=True, null=True, verbose_name=_l('enrollment start'), help_text=_l('If you want to add options, make sure your activity isn\'t open for enrollment right away'))
     enrollment_end = models.DateTimeField(blank=True, null=True, verbose_name=_l('enrollment end'))
+    enrollment_private = models.BooleanField(default=False, verbose_name=_l('Hide participants'))
     maximum = models.PositiveIntegerField(blank=True, null=True)
     waiting_list_locked = models.BooleanField(default=False, verbose_name=_l('Lock waiting list'))
 

amelie/activities/templates/activities/activity_form.html

@@ -118,7 +118,7 @@ <h2>{% if is_new %}{% trans 'Add event' %}{% else %}{% trans 'Edit this event' %
                 <h2>{% trans 'Enrollment' %}</h2>
 
                 <div class="content">
-                    {% fieldset enrollment,enrollment_begin,enrollment_end,maximum,waiting_list_locked,price,can_unenroll,callback_url,callback_secret_key,facebook_event_id,oauth_application as form_description from form %}
+                    {% fieldset enrollment,enrollment_begin,enrollment_end,enrollment_private,maximum,waiting_list_locked,price,can_unenroll,callback_url,callback_secret_key,facebook_event_id,oauth_application as form_description from form %}
                     {{ form_description }}
                 </div>
             </div>

amelie/activities/templates/activity.html

@@ -146,8 +146,8 @@ <h2 id="slider-carousel-title" class="h2-with-buttons">{% trans "Pictures of the
 		{% endif %}
 	</div>
 
-    {% if obj.enrollment %}
-        {% if obj.organizer in request.person.current_committees or request.is_board or is_roomduty %}
+    {% if obj.enrollment and request.person %}
+        {% if request.is_board or is_roomduty or is_committee %}
             <div class="col-xs-12 col-md-12">
                 <div class="current">
                     <h2 class="expand" data-target="export_options">{% trans 'Export enrollments' %}</h2>
@@ -175,14 +175,13 @@ <h2 class="expand" data-target="export_options">{% trans 'Export enrollments' %}
                     </div>
                 </div>
             </div>
-
-
+        {% endif %}
+        {% if not obj.enrollment_private or request.is_board or is_committee or is_roomduty %}
             <div class="col-xs-12 col-md-12">
                 <div class="current">
-                    <h2>{% trans 'Enrollments' %}</h2>
-
-                    <div id="enrollment_overview" class="content">
-                    {% include "activity_enrollment_overview.html" %}
+                    <h2 class="expand" data-target="enrollment_overview">{% trans 'Enrollment' %}</h2>
+                    <div id="enrollment_overview" class="content" style="overflow: hidden;">
+                        {% include "activity_enrollment_overview.html" %}
                     </div>
                 </div>
             </div>