Merge branch 'enext' into 404-urls-fix

Author: mariobehling

app/eventyay/agenda/views/schedule.py

@@ -116,7 +116,7 @@ def get_text(self, request, **kwargs):
             result = draw_ascii_schedule(data, output_format=output_format)
         except StopIteration:  # pragma: no cover
             result = draw_ascii_schedule(data, output_format='list')
-        result += '\n\n  📆 powered by eventyay'
+        result += '\n\n  powered by eventyay'
         return HttpResponse(response_start + result, content_type='text/plain; charset=utf-8')
 
     def dispatch(self, request, **kwargs):

app/eventyay/base/models/room.py

@@ -92,13 +92,16 @@ def with_permission(
         # When our user has traits, this is automatically ensured by the ALL() statement, but when traits=[] we
         # need to do a special case check since "IN ()" is not valid SQL
         for i, role in enumerate(roles):
-            if traits:
+            if traits and len(traits) > 0:
                 ext = ""
                 ext_args = []
                 if not allow_empty_traits:
                     ext = " AND jsonb_array_length(trait_grants->%s) > 0"
                     ext_args.append(role)
 
+                # Build IN clause with proper placeholders for each trait
+                in_placeholders = ','.join(['%s'] * len(traits))
+
                 qs = qs.annotate(
                     **{
                         f"has_role_{i}": RawSQL(
@@ -108,17 +111,17 @@ def with_permission(
                             TRUE = ALL(
                                 SELECT (
                                     CASE jsonb_typeof(d{i}.elem)
-                                        WHEN 'array' THEN EXISTS(SELECT 1 FROM jsonb_array_elements(d{i}.elem) e{i}(elem) WHERE e{i}.elem#>>'{"{}"}' IN %s )
-                                        ELSE d{i}.elem#>>'{"{}"}' IN %s
+                                        WHEN 'array' THEN EXISTS(SELECT 1 FROM jsonb_array_elements(d{i}.elem) e{i}(elem) WHERE e{i}.elem#>>'{"{}"}' IN ({in_placeholders}) )
+                                        ELSE d{i}.elem#>>'{"{}"}' IN ({in_placeholders})
                                     END
                                 ) FROM jsonb_array_elements( trait_grants->%s ) AS d{i}(elem)
                             ) {ext}
                         )""",
                             (
                                 role,  # ? check
                                 role,  # IS NOT NULL check
-                                tuple(traits),  # IN check
-                                tuple(traits),  # IN check
+                                *traits,  # IN check - expand traits as individual params
+                                *traits,  # IN check - expand traits as individual params
                                 role,  # jsonb_array_elements
                                 *ext_args,
                             ),
@@ -155,7 +158,7 @@ class Room(VersionedModel, OrderedModel, PretalxModel):
     The Room object stores some meta information. Most, like capacity,
     are not in use right now.
     """
-    
+
     log_prefix = "pretalx.room"
 
     deleted = models.BooleanField(default=False)